refactor: fix linting issues

hetznercloud · Jan 23, 2024 · 2a3360f · 2a3360f
1 parent eb57ac2
commit 2a3360f
Show file tree

Hide file tree

Showing 18 changed files with 167 additions and 119 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -0,0 +1,43 @@
+---
+linters-settings:
+  errcheck:
+    exclude-functions:
+      - (github.com/go-kit/log.Logger).Log
+  misspell:
+    locale: US
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/hetznercloud)
+
+linters:
+  disable-all: true
+  enable:
+    - bodyclose
+    - errcheck
+    - exportloopref
+    - gci
+    - gocritic
+    - gofmt
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - misspell
+    - prealloc
+    - revive
+    - rowserrcheck
+    - staticcheck
+    - typecheck
+    - unparam
+    - unused
+    - whitespace
+
+issues:
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - errcheck
+    - path: _test\.go
+      text: unused-parameter
diff --git a/api/volume.go b/api/volume.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 
 	"github.com/hetznercloud/csi-driver/csi"
 	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
 
 type VolumeService struct {

diff --git a/app/app.go b/app/app.go
@@ -13,12 +13,13 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
+	"github.com/prometheus/client_golang/prometheus"
+	"google.golang.org/grpc"
+
 	"github.com/hetznercloud/csi-driver/driver"
 	"github.com/hetznercloud/csi-driver/metrics"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud/metadata"
-	"github.com/prometheus/client_golang/prometheus"
-	"google.golang.org/grpc"
 )
 
 func parseLogLevel(lvl string) level.Option {

diff --git a/cmd/aio/main.go b/cmd/aio/main.go
@@ -9,6 +9,7 @@ import (
 	proto "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+
 	"github.com/hetznercloud/csi-driver/api"
 	"github.com/hetznercloud/csi-driver/app"
 	"github.com/hetznercloud/csi-driver/driver"

diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -6,6 +6,7 @@ import (
 	proto "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+
 	"github.com/hetznercloud/csi-driver/api"
 	"github.com/hetznercloud/csi-driver/app"
 	"github.com/hetznercloud/csi-driver/driver"

diff --git a/cmd/node/main.go b/cmd/node/main.go
@@ -9,6 +9,7 @@ import (
 	proto "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+
 	"github.com/hetznercloud/csi-driver/app"
 	"github.com/hetznercloud/csi-driver/driver"
 	"github.com/hetznercloud/csi-driver/volumes"

diff --git a/driver/controller.go b/driver/controller.go
@@ -75,7 +75,7 @@ func (s *ControllerService) CreateVolume(ctx context.Context, req *proto.CreateV
 			"err", err,
 		)
 		code := codes.Internal
-		switch err {
+		switch err { //nolint:gocritic
 		case volumes.ErrVolumeAlreadyExists:
 			code = codes.AlreadyExists
 		}
@@ -368,7 +368,7 @@ func (s *ControllerService) ControllerExpandVolume(ctx context.Context, req *pro
 
 	if err := s.volumeService.Resize(ctx, volume, minSize); err != nil {
 		code := codes.Internal
-		switch err {
+		switch err { //nolint:gocritic
 		case volumes.ErrVolumeNotFound:
 			code = codes.NotFound
 		}
@@ -377,7 +377,7 @@ func (s *ControllerService) ControllerExpandVolume(ctx context.Context, req *pro
 
 	if volume, err = s.volumeService.GetByID(ctx, volumeID); err != nil {
 		code := codes.Internal
-		switch err {
+		switch err { //nolint:gocritic
 		case volumes.ErrVolumeNotFound:
 			code = codes.NotFound
 		}
@@ -391,6 +391,6 @@ func (s *ControllerService) ControllerExpandVolume(ctx context.Context, req *pro
 	return resp, nil
 }
 
-func (s *ControllerService) ControllerGetVolume(ctx context.Context, req *proto.ControllerGetVolumeRequest) (*proto.ControllerGetVolumeResponse, error) {
+func (s *ControllerService) ControllerGetVolume(_ context.Context, _ *proto.ControllerGetVolumeRequest) (*proto.ControllerGetVolumeResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ControllerGetVolume not implemented")
 }
diff --git a/driver/controller_test.go b/driver/controller_test.go
@@ -7,8 +7,8 @@ import (
 
 	proto "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/go-kit/log"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"github.com/hetznercloud/csi-driver/csi"
 	"github.com/hetznercloud/csi-driver/mock"
@@ -69,7 +69,7 @@ func TestControllerServiceCreateVolume(t *testing.T) {
 			LimitBytes:    2 * MinVolumeSize * GB,
 		},
 		VolumeCapabilities: []*proto.VolumeCapability{
-			&proto.VolumeCapability{
+			{
 				AccessType: &proto.VolumeCapability_Mount{
 					Mount: &proto.VolumeCapability_MountVolume{},
 				},
@@ -121,7 +121,7 @@ func TestControllerServiceCreateVolumeWithLocation(t *testing.T) {
 			LimitBytes:    10 * GB,
 		},
 		VolumeCapabilities: []*proto.VolumeCapability{
-			&proto.VolumeCapability{
+			{
 				AccessType: &proto.VolumeCapability_Mount{
 					Mount: &proto.VolumeCapability_MountVolume{},
 				},
@@ -132,7 +132,7 @@ func TestControllerServiceCreateVolumeWithLocation(t *testing.T) {
 		},
 		AccessibilityRequirements: &proto.TopologyRequirement{
 			Preferred: []*proto.Topology{
-				&proto.Topology{
+				{
 					Segments: map[string]string{
 						TopologySegmentLocation: "explicit",
 					},
@@ -170,7 +170,7 @@ func TestControllerServiceCreateVolumeInputErrors(t *testing.T) {
 					LimitBytes:    10 * GB,
 				},
 				VolumeCapabilities: []*proto.VolumeCapability{
-					&proto.VolumeCapability{
+					{
 						AccessType: &proto.VolumeCapability_Mount{
 							Mount: &proto.VolumeCapability_MountVolume{},
 						},
@@ -202,7 +202,7 @@ func TestControllerServiceCreateVolumeInputErrors(t *testing.T) {
 					LimitBytes:    5 * GB,
 				},
 				VolumeCapabilities: []*proto.VolumeCapability{
-					&proto.VolumeCapability{
+					{
 						AccessType: &proto.VolumeCapability_Mount{
 							Mount: &proto.VolumeCapability_MountVolume{},
 						},
@@ -223,7 +223,7 @@ func TestControllerServiceCreateVolumeInputErrors(t *testing.T) {
 					LimitBytes:    10 * GB,
 				},
 				VolumeCapabilities: []*proto.VolumeCapability{
-					&proto.VolumeCapability{
+					{
 						AccessType: &proto.VolumeCapability_Mount{
 							Mount: &proto.VolumeCapability_MountVolume{},
 						},
@@ -240,7 +240,7 @@ func TestControllerServiceCreateVolumeInputErrors(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.Name, func(t *testing.T) {
 			_, err := env.service.CreateVolume(env.ctx, testCase.Req)
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -280,7 +280,7 @@ func TestControllerServiceCreateVolumeCreateErrors(t *testing.T) {
 					LimitBytes:    10 * GB,
 				},
 				VolumeCapabilities: []*proto.VolumeCapability{
-					&proto.VolumeCapability{
+					{
 						AccessType: &proto.VolumeCapability_Mount{
 							Mount: &proto.VolumeCapability_MountVolume{},
 						},
@@ -290,7 +290,7 @@ func TestControllerServiceCreateVolumeCreateErrors(t *testing.T) {
 					},
 				},
 			})
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -336,7 +336,7 @@ func TestControllerServiceDeleteVolumeInputErrors(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.Name, func(t *testing.T) {
 			_, err := env.service.DeleteVolume(env.ctx, testCase.Req)
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -353,7 +353,7 @@ func TestControllerServiceDeleteVolumeAttached(t *testing.T) {
 	_, err := env.service.DeleteVolume(env.ctx, &proto.DeleteVolumeRequest{
 		VolumeId: "1",
 	})
-	if grpc.Code(err) != codes.FailedPrecondition {
+	if status.Code(err) != codes.FailedPrecondition {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }
@@ -383,7 +383,7 @@ func TestControllerServiceDeleteVolumeInternalError(t *testing.T) {
 	_, err := env.service.DeleteVolume(env.ctx, &proto.DeleteVolumeRequest{
 		VolumeId: "1",
 	})
-	if grpc.Code(err) != codes.Internal {
+	if status.Code(err) != codes.Internal {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }
@@ -531,7 +531,7 @@ func TestControllerServicePublishVolumeInputErrors(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.Name, func(t *testing.T) {
 			_, err := env.service.ControllerPublishVolume(env.ctx, testCase.Req)
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -587,7 +587,7 @@ func TestControllerServicePublishVolumeAttachErrors(t *testing.T) {
 					},
 				},
 			})
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -678,7 +678,7 @@ func TestControllerServiceUnpublishVolumeInputErrors(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.Name, func(t *testing.T) {
 			_, err := env.service.ControllerUnpublishVolume(env.ctx, testCase.Req)
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -714,7 +714,7 @@ func TestControllerServiceUnpublishVolumeDetachErrors(t *testing.T) {
 				VolumeId: "1",
 				NodeId:   "2",
 			})
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -744,7 +744,7 @@ func TestControllerServiceValidateVolumeCapabilities(t *testing.T) {
 	req := &proto.ValidateVolumeCapabilitiesRequest{
 		VolumeId: "1",
 		VolumeCapabilities: []*proto.VolumeCapability{
-			&proto.VolumeCapability{
+			{
 				AccessMode: &proto.VolumeCapability_AccessMode{
 					Mode: proto.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 				},
@@ -776,7 +776,7 @@ func TestControllerServiceValidateVolumeCapabilitiesInputErrors(t *testing.T) {
 			Req: &proto.ValidateVolumeCapabilitiesRequest{
 				VolumeId: "",
 				VolumeCapabilities: []*proto.VolumeCapability{
-					&proto.VolumeCapability{
+					{
 						AccessMode: &proto.VolumeCapability_AccessMode{
 							Mode: proto.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 						},
@@ -797,7 +797,7 @@ func TestControllerServiceValidateVolumeCapabilitiesInputErrors(t *testing.T) {
 			Req: &proto.ValidateVolumeCapabilitiesRequest{
 				VolumeId: "xxx",
 				VolumeCapabilities: []*proto.VolumeCapability{
-					&proto.VolumeCapability{
+					{
 						AccessMode: &proto.VolumeCapability_AccessMode{
 							Mode: proto.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 						},
@@ -811,7 +811,7 @@ func TestControllerServiceValidateVolumeCapabilitiesInputErrors(t *testing.T) {
 	for _, testCase := range testCases {
 		t.Run(testCase.Name, func(t *testing.T) {
 			_, err := env.service.ValidateVolumeCapabilities(env.ctx, testCase.Req)
-			if grpc.Code(err) != testCase.Code {
+			if status.Code(err) != testCase.Code {
 				t.Fatalf("unexpected error: %v", err)
 			}
 		})
@@ -828,15 +828,15 @@ func TestControllerServiceValidateVolumeCapabilitiesVolumeNotFound(t *testing.T)
 	req := &proto.ValidateVolumeCapabilitiesRequest{
 		VolumeId: "1",
 		VolumeCapabilities: []*proto.VolumeCapability{
-			&proto.VolumeCapability{
+			{
 				AccessMode: &proto.VolumeCapability_AccessMode{
 					Mode: proto.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 				},
 			},
 		},
 	}
 	_, err := env.service.ValidateVolumeCapabilities(env.ctx, req)
-	if grpc.Code(err) != codes.NotFound {
+	if status.Code(err) != codes.NotFound {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }
@@ -851,15 +851,15 @@ func TestControllerServiceValidateVolumeCapabilitiesInternalError(t *testing.T)
 	req := &proto.ValidateVolumeCapabilitiesRequest{
 		VolumeId: "1",
 		VolumeCapabilities: []*proto.VolumeCapability{
-			&proto.VolumeCapability{
+			{
 				AccessMode: &proto.VolumeCapability_AccessMode{
 					Mode: proto.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
 				},
 			},
 		},
 	}
 	_, err := env.service.ValidateVolumeCapabilities(env.ctx, req)
-	if grpc.Code(err) != codes.Internal {
+	if status.Code(err) != codes.Internal {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }
@@ -874,7 +874,7 @@ func TestControllerServiceValidateVolumeCapabilitiesUnsupportedCapability(t *tes
 	req := &proto.ValidateVolumeCapabilitiesRequest{
 		VolumeId: "1",
 		VolumeCapabilities: []*proto.VolumeCapability{
-			&proto.VolumeCapability{
+			{
 				AccessMode: &proto.VolumeCapability_AccessMode{
 					Mode: proto.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER,
 				},