Merge pull request #377 from invidian/updates

Update golangci-lint to latest version v1.56.0

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: golangci/golangci-lint:v1.55.2
+    container: golangci/golangci-lint:v1.56.0
     steps:
     - uses: actions/cache@v2
       with:

.golangci.yml

@@ -83,6 +83,8 @@ linters:
     - godox
     # Disabled until we implement some error types and migrate to use them.
     - goerr113
+    # We don't really care about sprintf performance.
+    - perfsprint
     # To allow defensive approach when initializing structs.
     - ireturn
     # Disabled until tests are split and moved to the right file names.
@@ -154,7 +156,6 @@ linters:
     - nonamedreturns
     - nosprintfhostport
     - paralleltest
-    - perfsprint
     - prealloc
     - predeclared
     - promlinter
@@ -163,6 +164,7 @@ linters:
     - revive
     - rowserrcheck
     - sloglint
+    - spancheck
     - sqlclosecheck
     - stylecheck
     - tagalign

Makefile

@@ -11,7 +11,7 @@ GORUN=$(GOCMD) run
 GOBUILD=$(GOCMD) build -v -ldflags $(LD_FLAGS) -trimpath
 
 CC_TEST_REPORTER_ID=6e107e510c5479f40b0ce9166a254f3f1ee0bc547b3e48281bada1a5a32bb56d
-GOLANGCI_LINT_VERSION=v1.55.2
+GOLANGCI_LINT_VERSION=v1.56.0
 BIN_PATH=$$HOME/bin
 
 GO_PACKAGES=./...

pkg/etcd/member_test.go

@@ -159,8 +159,8 @@ func TestValidate(t *testing.T) {
 			t.Parallel()
 
 			m := testCase.mutator(validMember(t))
-			err := m.Validate()
 
+			err := m.Validate()
 			if testCase.expectError && err == nil {
 				t.Fatalf("Expected error")
 			}

pkg/host/host_test.go

@@ -75,6 +75,7 @@ func TestValidate(t *testing.T) {
 			if testCase.Error && err == nil {
 				t.Fatalf(testCase.Message)
 			}
+
 			if !testCase.Error && err != nil {
 				t.Errorf(testCase.Message)
 			}

pkg/host/transport/ssh/ssh_test.go

@@ -683,8 +683,6 @@ func TestNewBadSSHAgentEnv(t *testing.T) {
 	}
 }
 
-//nolint:paralleltest // This test may access SSHAuthSockEnv environment variable,
-//nolint:paralleltest // which is a global variable, so to keep things stable, don't run it in parallel.
 func TestNewSSHAgent(t *testing.T) {
 	agentKeyring := agent.NewKeyring()
 
@@ -729,8 +727,6 @@ func TestNewSSHAgent(t *testing.T) {
 	}
 }
 
-//nolint:paralleltest // This test may access SSHAuthSockEnv environment variable,
-//nolint:paralleltest // which is a global variable, so to keep things stable, don't run it in parallel.
 func TestNewSSHAgentWrongSocket(t *testing.T) {
 	addr := &net.UnixAddr{
 		Name: "@bar",

pkg/pki/privatekey_test.go

@@ -47,7 +47,6 @@ aHR0cHM6Ly93d3cueW91dHViZS5jb20vd2F0Y2g/dj1kUXc0dzlXZ1hjUQo=
 			t.Parallel()
 
 			err := pki.ValidatePrivateKey(testCase.key)
-
 			if testCase.err && err == nil {
 				t.Fatalf("Expected error and didn't get any.")
 			}

pkg/types/certificate_test.go

@@ -42,7 +42,6 @@ func TestCertificateParse(t *testing.T) {
 			bar := &Foo{}
 
 			err := yaml.Unmarshal([]byte(testCase.YAML), bar)
-
 			if testCase.Error && err == nil {
 				t.Fatalf("Expected error and didn't get any.")
 			}

pkg/types/privatekey_test.go

@@ -42,7 +42,6 @@ func TestPrivateKeyParse(t *testing.T) {
 			bar := &Foo{}
 
 			err := yaml.Unmarshal([]byte(testCase.YAML), bar)
-
 			if testCase.Error && err == nil {
 				t.Fatalf("Expected error and didn't get any.")
 			}