chore: upgrade golint version

Author: ScottZhuMS

.github/workflows/static.yaml

@@ -15,5 +15,5 @@ jobs:
             - name: Run linter
               uses: golangci/golangci-lint-action@v6
               with:
-                  version: v1.54
+                  version: v1.60
                   args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,contextcheck,depguard,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s

pkg/csi-common/utils_test.go

@@ -98,7 +98,7 @@ func TestLogGRPC(t *testing.T) {
 	buf := new(bytes.Buffer)
 	klog.SetOutput(buf)
 
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) { return nil, nil }
+	handler := func(_ context.Context, _ interface{}) (interface{}, error) { return nil, nil }
 	info := grpc.UnaryServerInfo{
 		FullMethod: "fake",
 	}

pkg/smb/controllerserver.go

@@ -108,18 +108,18 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	if createSubDir {
 		// Mount smb base share so we can create a subdirectory
 		if err := d.internalMount(ctx, smbVol, volCap, secrets); err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to mount smb server: %v", err.Error())
+			return nil, status.Errorf(codes.Internal, "failed to mount smb server: %v", err)
 		}
 		defer func() {
 			if err = d.internalUnmount(ctx, smbVol); err != nil {
-				klog.Warningf("failed to unmount smb server: %v", err.Error())
+				klog.Warningf("failed to unmount smb server: %v", err)
 			}
 		}()
 		// Create subdirectory under base-dir
 		// TODO: revisit permissions
 		internalVolumePath := getInternalVolumePath(d.workingMountDir, smbVol)
 		if err = os.MkdirAll(internalVolumePath, 0777); err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())
+			return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err)
 		}
 
 		if req.GetVolumeContentSource() != nil {
@@ -182,7 +182,7 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 		// check whether volumeID is in the cache
 		cache, err := d.volDeletionCache.Get(volumeID, azcache.CacheReadTypeDefault)
 		if err != nil {
-			return nil, status.Errorf(codes.Internal, err.Error())
+			return nil, status.Errorf(codes.Internal, "%v", err)
 		}
 		if cache != nil {
 			klog.V(2).Infof("DeleteVolume: volume %s is already deleted", volumeID)
@@ -191,11 +191,11 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 
 		// mount smb base share so we can delete or archive the subdirectory
 		if err = d.internalMount(ctx, smbVol, volCap, secrets); err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to mount smb server: %v", err.Error())
+			return nil, status.Errorf(codes.Internal, "failed to mount smb server: %v", err)
 		}
 		defer func() {
 			if err = d.internalUnmount(ctx, smbVol); err != nil {
-				klog.Warningf("failed to unmount smb server: %v", err.Error())
+				klog.Warningf("failed to unmount smb server: %v", err)
 			}
 		}()
 
@@ -207,7 +207,7 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 				parentDir := filepath.Dir(archivedInternalVolumePath)
 				klog.V(2).Infof("DeleteVolume: subdirectory(%s) contains '/', make sure the parent directory(%s) exists", smbVol.subDir, parentDir)
 				if err = os.MkdirAll(parentDir, 0777); err != nil {
-					return nil, status.Errorf(codes.Internal, "create parent directory(%s) of %s failed with %v", parentDir, archivedInternalVolumePath, err.Error())
+					return nil, status.Errorf(codes.Internal, "create parent directory(%s) of %s failed with %v", parentDir, archivedInternalVolumePath, err)
 				}
 			}
 
@@ -216,16 +216,16 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 			if d.removeArchivedVolumePath {
 				klog.V(2).Infof("removing archived subdirectory at %v", archivedInternalVolumePath)
 				if err = os.RemoveAll(archivedInternalVolumePath); err != nil {
-					return nil, status.Errorf(codes.Internal, "failed to delete archived subdirectory %s: %v", archivedInternalVolumePath, err.Error())
+					return nil, status.Errorf(codes.Internal, "failed to delete archived subdirectory %s: %v", archivedInternalVolumePath, err)
 				}
 				klog.V(2).Infof("removed archived subdirectory at %v", archivedInternalVolumePath)
 			}
 			if err = os.Rename(internalVolumePath, archivedInternalVolumePath); err != nil {
-				return nil, status.Errorf(codes.Internal, "archive subdirectory(%s, %s) failed with %v", internalVolumePath, archivedInternalVolumePath, err.Error())
+				return nil, status.Errorf(codes.Internal, "archive subdirectory(%s, %s) failed with %v", internalVolumePath, archivedInternalVolumePath, err)
 			}
 		} else {
 			if _, err2 := os.Lstat(internalVolumePath); err2 == nil {
-				err2 := filepath.WalkDir(internalVolumePath, func(path string, di fs.DirEntry, err error) error {
+				err2 := filepath.WalkDir(internalVolumePath, func(path string, _ fs.DirEntry, _ error) error {
 					return os.Chmod(path, 0777)
 				})
 				if err2 != nil {
@@ -234,7 +234,7 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 			}
 			klog.V(2).Infof("Removing subdirectory at %v", internalVolumePath)
 			if err = os.RemoveAll(internalVolumePath); err != nil {
-				return nil, status.Errorf(codes.Internal, "failed to delete subdirectory: %v", err.Error())
+				return nil, status.Errorf(codes.Internal, "failed to delete subdirectory: %v", err)
 			}
 		}
 	} else {

pkg/smb/controllerserver_test.go

@@ -74,7 +74,7 @@ func TestCreateVolume(t *testing.T) {
 	// Setup mounter
 	mounter, err := NewFakeMounter()
 	if err != nil {
-		t.Fatalf(fmt.Sprintf("failed to get fake mounter: %v", err))
+		t.Fatalf("failed to get fake mounter: %v", err)
 	}
 	d.mounter = mounter
 
@@ -234,7 +234,7 @@ func TestDeleteVolume(t *testing.T) {
 	// Setup mounter
 	mounter, err := NewFakeMounter()
 	if err != nil {
-		t.Fatalf(fmt.Sprintf("failed to get fake mounter: %v", err))
+		t.Fatalf("failed to get fake mounter: %v", err)
 	}
 	d.mounter = mounter
 
@@ -762,7 +762,7 @@ func TestCopyFromVolume(t *testing.T) {
 	// Setup mounter
 	mounter, err := NewFakeMounter()
 	if err != nil {
-		t.Fatalf(fmt.Sprintf("failed to get fake mounter: %v", err))
+		t.Fatalf("failed to get fake mounter: %v", err)
 	}
 	d.mounter = mounter
 

pkg/smb/nodeserver.go

@@ -300,7 +300,7 @@ func (d *Driver) NodeGetVolumeStats(_ context.Context, req *csi.NodeGetVolumeSta
 	// check if the volume stats is cached
 	cache, err := d.volStatsCache.Get(req.VolumeId, azcache.CacheReadTypeDefault)
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, err.Error())
+		return nil, status.Errorf(codes.Internal, "%v", err)
 	}
 	if cache != nil {
 		resp := cache.(csi.NodeGetVolumeStatsResponse)

pkg/smb/nodeserver_test.go

@@ -162,9 +162,9 @@ func TestNodeStageVolume(t *testing.T) {
 				strings.Replace(testSource, "\\", "\\\\", -1), errorMountSensSource, testSource, errorMountSensSource),
 			expectedErr: testutil.TestError{
 				DefaultError: status.Errorf(codes.Internal,
-					fmt.Sprintf("volume(vol_1##) mount \"%s\" on \"%s\" failed with fake "+
+					"volume(vol_1##) mount \"%s\" on \"%s\" failed with fake "+
 						"MountSensitive: target error",
-						strings.Replace(testSource, "\\", "\\\\", -1), errorMountSensSource)),
+					strings.Replace(testSource, "\\", "\\\\", -1), errorMountSensSource),
 			},
 		},
 		{
@@ -202,7 +202,7 @@ func TestNodeStageVolume(t *testing.T) {
 		}
 		mounter, err := NewFakeMounter()
 		if err != nil {
-			t.Fatalf(fmt.Sprintf("failed to get fake mounter: %v", err))
+			t.Fatalf("failed to get fake mounter: %v", err)
 		}
 		d.mounter = mounter
 
@@ -344,7 +344,7 @@ func TestNodePublishVolume(t *testing.T) {
 			// Once the issue is figured out, we'll remove this field
 			skipOnWindows: true,
 			expectedErr: testutil.TestError{
-				DefaultError: status.Errorf(codes.Internal, fmt.Sprintf("Could not mount \"%s\" at \"%s\": fake Mount: source error", errorMountSource, targetTest)),
+				DefaultError: status.Errorf(codes.Internal, "Could not mount \"%s\" at \"%s\": fake Mount: source error", errorMountSource, targetTest),
 			},
 		},
 		{
@@ -381,7 +381,7 @@ func TestNodePublishVolume(t *testing.T) {
 	d := NewFakeDriver()
 	mounter, err := NewFakeMounter()
 	if err != nil {
-		t.Fatalf(fmt.Sprintf("failed to get fake mounter: %v", err))
+		t.Fatalf("failed to get fake mounter: %v", err)
 	}
 	d.mounter = mounter
 
@@ -446,7 +446,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
 	d := NewFakeDriver()
 	mounter, err := NewFakeMounter()
 	if err != nil {
-		t.Fatalf(fmt.Sprintf("failed to get fake mounter: %v", err))
+		t.Fatalf("failed to get fake mounter: %v", err)
 	}
 	d.mounter = mounter
 
@@ -522,7 +522,7 @@ func TestNodeUnstageVolume(t *testing.T) {
 	d := NewFakeDriver()
 	mounter, err := NewFakeMounter()
 	if err != nil {
-		t.Fatalf(fmt.Sprintf("failed to get fake mounter: %v", err))
+		t.Fatalf("failed to get fake mounter: %v", err)
 	}
 	d.mounter = mounter
 

pkg/smb/smb.go

@@ -118,7 +118,7 @@ func NewDriver(options *DriverOptions) *Driver {
 		options.VolStatsCacheExpireInMinutes = 10 // default expire in 10 minutes
 	}
 	var err error
-	getter := func(key string) (interface{}, error) { return nil, nil }
+	getter := func(_ string) (interface{}, error) { return nil, nil }
 	if driver.volStatsCache, err = azcache.NewTimedCache(time.Duration(options.VolStatsCacheExpireInMinutes)*time.Minute, getter, false); err != nil {
 		klog.Fatalf("%v", err)
 	}

pkg/smb/smb_test.go

@@ -91,14 +91,14 @@ func TestRun(t *testing.T) {
 	}{
 		{
 			name: "Successful run",
-			testFunc: func(t *testing.T) {
+			testFunc: func(_ *testing.T) {
 				d := NewFakeDriver()
 				d.Run("tcp://127.0.0.1:0", "", true)
 			},
 		},
 		{
 			name: "Successful run with node ID missing",
-			testFunc: func(t *testing.T) {
+			testFunc: func(_ *testing.T) {
 				d := NewFakeDriver()
 				d.NodeID = ""
 				d.Run("tcp://127.0.0.1:0", "", true)

test/e2e/dynamic_provisioning_test.go

@@ -40,7 +40,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {
 		testDriver driver.PVTestDriver
 	)
 
-	ginkgo.BeforeEach(func(ctx ginkgo.SpecContext) {
+	ginkgo.BeforeEach(func(_ ginkgo.SpecContext) {
 		checkPodsRestart := testCmd{
 			command:  "sh",
 			args:     []string{"test/utils/check_driver_pods_restart.sh"},