Stricter linting (#159)

.golangci.yml

@@ -1,24 +1,36 @@
+run:
+  timeout: 5m
+
 linters:
+  disable-all: true
   enable:
+    # these are enabled by default
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - typecheck
+    - unused
+    # cherry picked from https://golangci-lint.run/usage/linters/
+    # - ginkgolinter # to be enabled once #158 is merged
+    - bodyclose
+    - exportloopref
+    - gocheckcompilerdirectives
     - gofmt
     - goimports
-    - structcheck
-    - varcheck
-    - staticcheck
+    - importas
+    - loggercheck
+    - makezero
+    - nilerr
+    - prealloc
+    - reassign
+    - tenv
     - unconvert
-    - revive
-    - ineffassign
-    - vet
-    - unused
-    - misspell
-  disable:
-    - errcheck
-
-run:
-  tests: false
-  timeout: 8m
-  skip-dirs:
-    - api
-    - design
-    - docs
-    - docs/man
+    - wastedassign
+    - unparam
+    - gofumpt
+    - nosprintfhostport
+    - musttag
+    - exhaustive
+    - nilnil

Makefile

@@ -18,6 +18,8 @@ codegen:
 lint:
 	docker run --rm -v "$(shell pwd):/var/work:ro" -w /var/work \
 		golangci/golangci-lint:v1.55.2 golangci-lint run -v --timeout=5m
+	docker run --rm -v "$(shell pwd):/var/work:ro" -w /var/work/e2e \
+		golangci/golangci-lint:v1.55.2 golangci-lint run -v --timeout=5m
 
 .PHONY: fmt
 fmt:

cloud/linode/common_test.go

@@ -46,7 +46,3 @@ func TestParseProviderID(t *testing.T) {
 		})
 	}
 }
-
-func stringPtr(s string) *string {
-	return &s
-}

cloud/linode/fake_linode_test.go

@@ -240,7 +240,6 @@ func (f *fakeAPI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				_, _ = w.Write(rr)
 				return
 			}
-
 		}
 
 	case "POST":
@@ -596,9 +595,9 @@ func (f *fakeAPI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func randString(n int) string {
+func randString() string {
 	const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	b := make([]byte, n)
+	b := make([]byte, 10)
 	for i := range b {
 		b[i] = letterBytes[rand.Intn(len(letterBytes))]
 	}

cloud/linode/instances_test.go

@@ -57,10 +57,12 @@ func TestInstanceExists(t *testing.T) {
 		instances := newInstances(client)
 		node := nodeWithProviderID(providerIDPrefix + "123")
 		client.EXPECT().ListInstances(gomock.Any(), nil).Times(1).Return([]linodego.Instance{
-			{ID: 123,
+			{
+				ID:     123,
 				Label:  "mock",
 				Region: "us-east",
-				Type:   "g6-standard-2"},
+				Type:   "g6-standard-2",
+			},
 		}, nil)
 
 		exists, err := instances.InstanceExists(ctx, node)
@@ -154,16 +156,36 @@ func TestMetadataRetrieval(t *testing.T) {
 		expectedErr     error
 	}{
 		{"no IPs", nil, nil, instanceNoIPAddressesError{192910}},
-		{"one public, one private", []string{"32.74.121.25", "192.168.121.42"},
-			[]v1.NodeAddress{{Type: v1.NodeExternalIP, Address: "32.74.121.25"}, {Type: v1.NodeInternalIP, Address: "192.168.121.42"}}, nil},
-		{"one public, no private", []string{"32.74.121.25"},
-			[]v1.NodeAddress{{Type: v1.NodeExternalIP, Address: "32.74.121.25"}}, nil},
-		{"one private, no public", []string{"192.168.121.42"},
-			[]v1.NodeAddress{{Type: v1.NodeInternalIP, Address: "192.168.121.42"}}, nil},
-		{"two public addresses", []string{"32.74.121.25", "32.74.121.22"},
-			[]v1.NodeAddress{{Type: v1.NodeExternalIP, Address: "32.74.121.25"}, {Type: v1.NodeExternalIP, Address: "32.74.121.22"}}, nil},
-		{"two private addresses", []string{"192.168.121.42", "10.0.2.15"},
-			[]v1.NodeAddress{{Type: v1.NodeInternalIP, Address: "192.168.121.42"}, {Type: v1.NodeInternalIP, Address: "10.0.2.15"}}, nil},
+		{
+			"one public, one private",
+			[]string{"32.74.121.25", "192.168.121.42"},
+			[]v1.NodeAddress{{Type: v1.NodeExternalIP, Address: "32.74.121.25"}, {Type: v1.NodeInternalIP, Address: "192.168.121.42"}},
+			nil,
+		},
+		{
+			"one public, no private",
+			[]string{"32.74.121.25"},
+			[]v1.NodeAddress{{Type: v1.NodeExternalIP, Address: "32.74.121.25"}},
+			nil,
+		},
+		{
+			"one private, no public",
+			[]string{"192.168.121.42"},
+			[]v1.NodeAddress{{Type: v1.NodeInternalIP, Address: "192.168.121.42"}},
+			nil,
+		},
+		{
+			"two public addresses",
+			[]string{"32.74.121.25", "32.74.121.22"},
+			[]v1.NodeAddress{{Type: v1.NodeExternalIP, Address: "32.74.121.25"}, {Type: v1.NodeExternalIP, Address: "32.74.121.22"}},
+			nil,
+		},
+		{
+			"two private addresses",
+			[]string{"192.168.121.42", "10.0.2.15"},
+			[]v1.NodeAddress{{Type: v1.NodeInternalIP, Address: "192.168.121.42"}, {Type: v1.NodeInternalIP, Address: "10.0.2.15"}},
+			nil,
+		},
 	}
 
 	for _, test := range ipTests {
@@ -281,7 +303,8 @@ func TestInstanceShutdown(t *testing.T) {
 		id := 12345
 		node := nodeWithProviderID(providerIDPrefix + strconv.Itoa(id))
 		client.EXPECT().ListInstances(gomock.Any(), nil).Times(1).Return([]linodego.Instance{
-			{ID: id, Label: "shutting-down-linode", Status: linodego.InstanceShuttingDown}}, nil)
+			{ID: id, Label: "shutting-down-linode", Status: linodego.InstanceShuttingDown},
+		}, nil)
 		shutdown, err := instances.InstanceShutdown(ctx, node)
 
 		assert.NoError(t, err)

cloud/linode/loadbalancers.go

@@ -55,9 +55,7 @@ const (
 	annLinodeNodePrivateIP = "node.k8s.linode.com/private-ip"
 )
 
-var (
-	errNoNodesAvailable = errors.New("no nodes available for nodebalancer")
-)
+var errNoNodesAvailable = errors.New("no nodes available for nodebalancer")
 
 type lbNotFoundError struct {
 	serviceNn      string
@@ -547,7 +545,7 @@ func (l *loadbalancers) buildNodeBalancerConfig(ctx context.Context, service *v1
 
 	health, err := getHealthCheckType(service)
 	if err != nil {
-		return linodego.NodeBalancerConfig{}, nil
+		return linodego.NodeBalancerConfig{}, err
 	}
 
 	config := linodego.NodeBalancerConfig{