Updated linting config and fixed a bunch of issues.

Author: davepgreene

.golangci.yml

@@ -2,22 +2,57 @@ linters:
   disable-all: true
   enable:
     - govet
+    - deadcode
     - vet
     - staticcheck
     - revive
     - errcheck
     - ineffassign
     - misspell
-#
-#issues:
-#  exclude-rules:
-#    - path: _test\.go
-#      linters:
-#        - goerr113
-#        - gochecknoglobals
-#        - wsl
-#        - lll
-#        - funlen
+    - nlreturn
+    - gosec
 
 run:
   timeout: 5m
+
+issues:
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - funlen
+        - bodyclose
+        - gosec
+        - revive
+    - path: example/
+      text: "avoid magic numbers"
+
+linters-settings:
+  revive:
+    enable-all-rules: true
+    rules:
+      - name: cognitive-complexity
+        disabled: true
+      - name: line-length-limit
+        arguments: [120]
+      - name: function-length
+        arguments: [50, 0]
+      - name: argument-limit
+        disabled: true
+      - name: banned-characters
+        disabled: true
+      - name: cyclomatic
+        arguments: [15]
+      - name: function-result-limit
+        arguments: [3]
+      - name: max-public-structs
+        arguments: [3]
+      - name: file-header
+        disabled: true
+      - name: add-constant
+        arguments:
+          - allowStrs: '""'
+            allowInts: "0,1,2"
+      - name: unhandled-error
+        arguments:
+          - "fmt.Printf"
+          - "fmt.Println"

driver/connector_test.go

@@ -39,6 +39,7 @@ type testDriver struct {
 func (d *testDriver) Open(dsn string) (driver.Conn, error) {
 	d.Called++
 	d.ConnStr = dsn
+
 	return d.Conn, d.ConnErr
 }
 
@@ -56,6 +57,7 @@ func (fd *testFailingDriver) Open(dsn string) (driver.Conn, error) {
 	if fd.Called == 1 {
 		return nil, fd.ConnErr
 	}
+
 	return nil, nil
 }
 
@@ -384,6 +386,7 @@ func TestConnectorFailsToRefreshOnConnectionFailure(t *testing.T) {
 		},
 		Refresher: func(ctx context.Context) (Credentials, error) {
 			refreshCalled++
+
 			return nil, errors.New("failed to refresh creds")
 		},
 	}, "driver", &cfg)
@@ -449,6 +452,7 @@ func TestConnectorRetriesUntilSuccess(t *testing.T) {
 					Password: password,
 				}, nil
 			}
+
 			return nil, errors.New("failed to refresh creds")
 		},
 	}, "driver", &cfg)
@@ -514,6 +518,7 @@ func TestConnectorRetriesUntilMax(t *testing.T) {
 		},
 		Refresher: func(ctx context.Context) (Credentials, error) {
 			refreshCalled++
+
 			return &testCredential{
 				Username: username,
 				Password: password,
@@ -583,6 +588,7 @@ func TestConnectorRetriesUntilNonAuthError(t *testing.T) {
 		},
 		Refresher: func(ctx context.Context) (Credentials, error) {
 			refreshCalled++
+
 			return &testCredential{
 				Username: username,
 				Password: password,

driver/formatter_test.go

@@ -89,6 +89,7 @@ func TestFormatters(t *testing.T) {
 				if dsn != testCase.expectedDsn {
 					t.Fatalf("expected %s but got %s", testCase.expectedDsn, dsn)
 				}
+
 				return
 			}
 			// Because url.Values is a map[string][]string we get randomized ordering before encoding so we

store/awsrds/store_test.go

@@ -17,7 +17,7 @@ import (
 func TestStoreValidation(t *testing.T) {
 	if _, err := NewStore(nil); err == nil {
 		t.Error("expected an error but didn't get one")
-	} else if err != errMissingConfig {
+	} else if !errors.Is(err, errMissingConfig) {
 		t.Errorf("expected '%T' but got '%T' instead", errMissingConfig, err)
 	}
 
@@ -103,12 +103,14 @@ func TestStoreValidation(t *testing.T) {
 			_, err = NewStore(&conf)
 			if err == nil {
 				t.Error("expected an error but didn't get one")
+
 				return
 			}
 
 			// If we have a pointer to an error we need to compare error strings
 			if reflect.ValueOf(testCase.expectedErr).Kind() == reflect.Ptr && err.Error() != testCase.expectedErr.Error() {
 				t.Errorf("expected '%v' but got '%v' instead", testCase.expectedErr, err)
+
 				return
 			}
 
@@ -209,6 +211,7 @@ func TestStoreCachesCredentials(t *testing.T) {
 	patch = monkey.Patch(time.Now, func() time.Time {
 		patch.Unpatch()
 		defer patch.Restore()
+
 		return time.Now().Add(20 * time.Minute)
 	})
 	defer patch.Unpatch()

store/vault/auth/kubernetes_test.go

@@ -52,18 +52,21 @@ qQYZl8EZf4Jznaes/XFP0Yb+IhGXBoR9Ib+I
 func tokenReviewHandler(w http.ResponseWriter, r *http.Request) {
 	if r.URL.Path != "/apis/authentication.k8s.io/v1/tokenreviews" {
 		w.WriteHeader(404)
+
 		return
 	}
 	body, err := ioutil.ReadAll(r.Body)
 	if err != nil {
 		w.WriteHeader(500)
+
 		return
 	}
-	defer r.Body.Close()
+	defer r.Body.Close() //nolint:errcheck
 
 	var tr authv1.TokenReview
 	if err := json.Unmarshal(body, &tr); err != nil {
 		w.WriteHeader(500)
+
 		return
 	}
 
@@ -84,7 +87,7 @@ func TestKubernetesAuth(t *testing.T) {
 	defer srv.Close()
 
 	ln, client := vaulttest.CreateTestVault(t, nil)
-	defer ln.Close()
+	defer ln.Close() //nolint:errcheck
 
 	ctx := context.Background()
 
@@ -115,7 +118,7 @@ func TestKubernetesAuth(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	defer os.Remove(tmpfile.Name())
+	defer os.Remove(tmpfile.Name()) //nolint:errcheck
 
 	if _, err = tmpfile.Write([]byte(jwtData)); err != nil {
 		t.Error(err)
@@ -182,9 +185,9 @@ func TestKubernetesAuthFileError(t *testing.T) {
 }
 
 func TestKubernetesAuthVaultError(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc((func(w http.ResponseWriter, r *http.Request) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(404)
-	})))
+	}))
 	defer srv.Close()
 
 	client, err := api.NewClient(nil)
@@ -200,7 +203,7 @@ func TestKubernetesAuthVaultError(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	defer os.Remove(tmpfile.Name())
+	defer os.Remove(tmpfile.Name()) //nolint:errcheck
 
 	if _, err = tmpfile.Write([]byte(jwtData)); err != nil {
 		t.Error(err)

store/vault/credentials/agent_database_test.go

@@ -25,6 +25,7 @@ var testMapper Mapper = func(s string) (*store.Credential, error) {
 			Password: creds[1],
 		}, nil
 	}
+
 	return nil, errors.New("mapping function failed")
 }
 

store/vault/credentials/kv.go

@@ -26,6 +26,6 @@ func (kv *KvCredentials) GetCredentials(ctx context.Context, client *api.Client)
 }
 
 // Map implements the CredentialLocation interface.
-func (kv *KvCredentials) Map(s string) (*store.Credential, error) {
+func (*KvCredentials) Map(s string) (*store.Credential, error) {
 	return DefaultMapper(s)
 }

store/vault/example/main.go

@@ -98,6 +98,7 @@ func Run() error {
 		err = db.Ping(ctx, database)
 		if err != nil {
 			fmt.Println(err)
+
 			break
 		}
 
@@ -110,6 +111,7 @@ func Run() error {
 		})
 		if err != nil {
 			fmt.Println(err)
+
 			break
 		}
 

store/vault/store_test.go

@@ -216,6 +216,7 @@ func TestNewStoreWithClientThatAlreadyHasToken(t *testing.T) {
 				if c.Token() != client.Token() {
 					t.Fatalf("expected token to be '%s' but got '%s' instead", client.Token(), c.Token())
 				}
+
 				return fmt.Sprintf(`{"username": "%s", "password": "%s"}`, username, password), nil
 			},
 			Mapper: vaultcredentials.DefaultMapper,
@@ -285,6 +286,7 @@ func TestStoreWithCachedCredentials(t *testing.T) {
 			},
 			Mapper: func(s string) (*store.Credential, error) {
 				mapCallCount++
+
 				return vaultcredentials.DefaultMapper(s)
 			},
 		},