CLOUDP-105826: Update golangci-lint to 1.43 (#266)

Author: gssbzn

.github/workflows/pr.yml

@@ -13,9 +13,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: lint
-        uses: golangci/golangci-lint-action@v2.5.2
+        uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.40.1
+          version: v1.43.0
 
   tests-on-unix:
     needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
@@ -33,7 +33,7 @@ jobs:
         with:
           go-version: ${{ matrix.golang }}
       - name: Cache Dependencies
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }}

GNUmakefile

@@ -1,6 +1,6 @@
 SOURCE_FILES?=./...
 PKG_NAME=mongodbatlas
-GOLANGCI_VERSION=v1.40.1
+GOLANGCI_VERSION=v1.43.0
 COVERAGE=coverage.out
 
 export GO111MODULE := on

mongodbatlas/accesslist_api_keys.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 )
 
-const accessListAPIKeysPath = "api/atlas/v1.0/orgs/%s/apiKeys/%s/accessList"
+const accessListAPIKeysPath = "api/atlas/v1.0/orgs/%s/apiKeys/%s/accessList" //nolint:gosec // This is a path
 
 // AccessListAPIKeysService is an interface for interfacing with the AccessList API Keys
 // endpoints of the MongoDB Atlas API.

mongodbatlas/accesslist_api_keys_test.go

@@ -23,13 +23,15 @@ import (
 	"github.com/go-test/deep"
 )
 
+const (
+	apiKeyID  = "API-KEY-ID" //nolint:gosec // ID and not an actual key
+	ipAddress = "IP-ADDRESS"
+)
+
 func TestAccessListAPIKeys_List(t *testing.T) {
 	client, mux, teardown := setup()
 	defer teardown()
 
-	orgID := "ORG-ID"
-	apiKeyID := "API-KEY-ID"
-
 	mux.HandleFunc(fmt.Sprintf("/"+accessListAPIKeysPath, orgID, apiKeyID), func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
 		fmt.Fprint(w, `{
@@ -127,10 +129,6 @@ func TestAccessListAPIKeys_Get(t *testing.T) {
 	client, mux, teardown := setup()
 	defer teardown()
 
-	orgID := "ORG-ID"
-	apiKeyID := "API-KEY-ID"
-	ipAddress := "IP-ADDRESS"
-
 	mux.HandleFunc(fmt.Sprintf("/"+accessListAPIKeysPath+"/%s", orgID, apiKeyID, ipAddress), func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
 		fmt.Fprint(w, `{
@@ -174,9 +172,6 @@ func TestAccessListAPIKeys_Create(t *testing.T) {
 	client, mux, teardown := setup()
 	defer teardown()
 
-	orgID := "ORG-ID"
-	apiKeyID := "API-KEY-ID"
-
 	createRequest := []*AccessListAPIKeysReq{
 		{
 			IPAddress: "77.54.32.11",
@@ -297,10 +292,6 @@ func TestAccessListAPIKeys_Delete(t *testing.T) {
 	client, mux, teardown := setup()
 	defer teardown()
 
-	orgID := "ORG-ID"
-	apiKeyID := "API-KEY-ID"
-	ipAddress := "IP-ADDRESS"
-
 	mux.HandleFunc(fmt.Sprintf("/"+accessListAPIKeysPath+"/%s", orgID, apiKeyID, ipAddress), func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodDelete)
 	})

mongodbatlas/api_keys.go

@@ -21,7 +21,7 @@ import (
 	"net/url"
 )
 
-const apiKeysPath = "api/atlas/v1.0/orgs/%s/apiKeys"
+const apiKeysPath = "api/atlas/v1.0/orgs/%s/apiKeys" //nolint:gosec // This is a path
 
 // APIKeysService is an interface for interfacing with the APIKeys
 // endpoints of the MongoDB Atlas API.

mongodbatlas/api_keys_test.go

@@ -235,8 +235,6 @@ func TestAPIKeys_Create(t *testing.T) {
 	client, mux, teardown := setup()
 	defer teardown()
 
-	orgID := "1"
-
 	createRequest := &APIKeyInput{
 		Desc:  "test-apiKey",
 		Roles: []string{"GROUP_OWNER"},
@@ -382,9 +380,6 @@ func TestAPIKeys_Delete(t *testing.T) {
 	client, mux, teardown := setup()
 	defer teardown()
 
-	orgID := "1"
-	apiKeyID := "5c47503320eef5699e1cce8d"
-
 	mux.HandleFunc(fmt.Sprintf("/api/atlas/v1.0/orgs/%s/apiKeys/%s", orgID, apiKeyID), func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodDelete)
 	})

mongodbatlas/mongodbatlas.go

@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -448,7 +447,7 @@ func (c *Client) Do(ctx context.Context, req *http.Request, v interface{}) (*Res
 		// won't reuse it anyway.
 		const maxBodySlurpSize = 2 << 10
 		if resp.ContentLength == -1 || resp.ContentLength <= maxBodySlurpSize {
-			_, _ = io.CopyN(ioutil.Discard, resp.Body, maxBodySlurpSize)
+			_, _ = io.CopyN(io.Discard, resp.Body, maxBodySlurpSize)
 		}
 
 		resp.Body.Close()
@@ -519,7 +518,7 @@ func CheckResponse(r *http.Response) error {
 	}
 
 	errorResponse := &ErrorResponse{Response: r}
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err == nil && len(data) > 0 {
 		err := json.Unmarshal(data, errorResponse)
 		if err != nil {

mongodbatlas/mongodbatlas_test.go

@@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/http/httputil"
@@ -165,7 +165,7 @@ func TestNewRequest_withUserData(t *testing.T) {
 	}
 
 	// test body was JSON encoded
-	body, _ := ioutil.ReadAll(req.Body)
+	body, _ := io.ReadAll(req.Body)
 	if string(body) != outBody {
 		t.Errorf("NewRequest(%v)Body = %v, expected %v", inBody, string(body), outBody)
 	}
@@ -427,7 +427,7 @@ func TestCheckResponse(t *testing.T) {
 	res := &http.Response{
 		Request:    &http.Request{},
 		StatusCode: http.StatusBadRequest,
-		Body: ioutil.NopCloser(
+		Body: io.NopCloser(
 			strings.NewReader(
 				`{"error":409, "errorCode": "GROUP_ALREADY_EXISTS", "reason":"Conflict", "detail":"A group with name \"Test\" already exists"}`,
 			),
@@ -456,7 +456,7 @@ func TestCheckResponse_noBody(t *testing.T) {
 	res := &http.Response{
 		Request:    &http.Request{},
 		StatusCode: http.StatusBadRequest,
-		Body:       ioutil.NopCloser(strings.NewReader("")),
+		Body:       io.NopCloser(strings.NewReader("")),
 	}
 	var target *ErrorResponse
 	if !errors.As(CheckResponse(res), &target) {

mongodbatlas/project_api_key.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 )
 
-const projectAPIKeysPath = "api/atlas/v1.0/groups/%s/apiKeys"
+const projectAPIKeysPath = "api/atlas/v1.0/groups/%s/apiKeys" //nolint:gosec // This is a path
 
 // ProjectAPIKeysService is an interface for interfacing with the APIKeys
 // endpoints of the MongoDB Atlas API.

mongodbatlas/whitelist_api_keys.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 )
 
-const whitelistAPIKeysPath = "api/atlas/v1.0/orgs/%s/apiKeys/%s/whitelist"
+const whitelistAPIKeysPath = "api/atlas/v1.0/orgs/%s/apiKeys/%s/whitelist" //nolint:gosec // This is a path
 
 // WhitelistAPIKeysService is an interface for interfacing with the Whitelist API Keys
 // endpoints of the MongoDB Atlas API.