Merge pull request #765 from Zhupku/mengzezhu/upgrade-golint-version

k8s-ci-robot · web-flow · commit e1f2a24e82ed · 2024-09-06T06:22:28.000+01:00
chore: upgrade golint version
diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
@@ -15,7 +15,7 @@ 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 --timeout=30m0s
     verify-helm:
         name: Verify Helm
diff --git a/pkg/nfs/controllerserver.go b/pkg/nfs/controllerserver.go
@@ -144,11 +144,11 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 			if v != "" {
 				var err error
 				if mountPermissions, err = strconv.ParseUint(v, 8, 32); err != nil {
-					return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid mountPermissions %s in storage class", v))
+					return nil, status.Errorf(codes.InvalidArgument, "invalid mountPermissions %s in storage class", v)
 				}
 			}
 		default:
-			return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid parameter %q in storage class", k))
+			return nil, status.Errorf(codes.InvalidArgument, "invalid parameter %q in storage class", k)
 		}
 	}
 
@@ -168,24 +168,24 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	}
 	// Mount nfs base share so we can create a subdirectory
 	if err = cs.internalMount(ctx, nfsVol, parameters, volCap); err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err.Error())
+		return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err)
 	}
 	defer func() {
 		if err = cs.internalUnmount(ctx, nfsVol); err != nil {
-			klog.Warningf("failed to unmount nfs server: %v", err.Error())
+			klog.Warningf("failed to unmount nfs server: %v", err)
 		}
 	}()
 
 	// Create subdirectory under base-dir
 	internalVolumePath := getInternalVolumePath(cs.Driver.workingMountDir, nfsVol)
 	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 mountPermissions > 0 {
 		// Reset directory permissions because of umask problems
 		if err = os.Chmod(internalVolumePath, os.FileMode(mountPermissions)); err != nil {
-			klog.Warningf("failed to chmod subdirectory: %v", err.Error())
+			klog.Warningf("failed to chmod subdirectory: %v", err)
 		}
 	}
 
@@ -245,19 +245,19 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 		// check whether volumeID is in the cache
 		cache, err := cs.Driver.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)
 			return &csi.DeleteVolumeResponse{}, nil
 		}
 		// mount nfs base share so we can delete the subdirectory
 		if err = cs.internalMount(ctx, nfsVol, nil, volCap); err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err.Error())
+			return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err)
 		}
 		defer func() {
 			if err = cs.internalUnmount(ctx, nfsVol); err != nil {
-				klog.Warningf("failed to unmount nfs server: %v", err.Error())
+				klog.Warningf("failed to unmount nfs server: %v", err)
 			}
 		}()
 
@@ -269,7 +269,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 				parentDir := filepath.Dir(archivedInternalVolumePath)
 				klog.V(2).Infof("DeleteVolume: subdirectory(%s) contains '/', make sure the parent directory(%s) exists", nfsVol.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)
 				}
 			}
 
@@ -278,12 +278,12 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 			if cs.Driver.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)
 			}
 			// make sure internalVolumePath does not exist with 1 minute timeout
 			if err = waitForPathNotExistWithTimeout(internalVolumePath, time.Minute); err != nil {
@@ -294,7 +294,7 @@ func (cs *ControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 			// delete subdirectory under base-dir
 			klog.V(2).Infof("removing subdirectory at %v", internalVolumePath)
 			if err = os.RemoveAll(internalVolumePath); err != nil {
-				return nil, status.Errorf(codes.Internal, "delete subdirectory(%s) failed with %v", internalVolumePath, err.Error())
+				return nil, status.Errorf(codes.Internal, "delete subdirectory(%s) failed with %v", internalVolumePath, err)
 			}
 		}
 	} else {
@@ -455,7 +455,7 @@ func (cs *ControllerServer) DeleteSnapshot(ctx context.Context, req *csi.DeleteS
 	internalVolumePath := getInternalVolumePath(cs.Driver.workingMountDir, vol)
 	klog.V(2).Infof("Removing snapshot archive 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)
 	}
 
 	return &csi.DeleteSnapshotResponse{}, nil
@@ -620,7 +620,7 @@ func newNFSSnapshot(name string, params map[string]string, vol *nfsVolume) (*nfs
 		case paramShare:
 			baseDir = v
 		default:
-			return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid parameter %q in snapshot storage class", k))
+			return nil, status.Errorf(codes.InvalidArgument, "invalid parameter %q in snapshot storage class", k)
 		}
 	}
 
diff --git a/pkg/nfs/nfs.go b/pkg/nfs/nfs.go
@@ -117,7 +117,7 @@ func NewDriver(options *DriverOptions) *Driver {
 	}
 
 	var err error
-	getter := func(key string) (interface{}, error) { return nil, nil }
+	getter := func(_ string) (interface{}, error) { return nil, nil }
 	if n.volStatsCache, err = azcache.NewTimedCache(time.Duration(options.VolStatsCacheExpireInMinutes)*time.Minute, getter, false); err != nil {
 		klog.Fatalf("%v", err)
 	}
diff --git a/pkg/nfs/nfs_test.go b/pkg/nfs/nfs_test.go
@@ -54,7 +54,7 @@ func NewEmptyDriver(emptyField string) *Driver {
 		}
 	}
 	d.volumeLocks = NewVolumeLocks()
-	getter := func(key string) (interface{}, error) { return nil, nil }
+	getter := func(_ string) (interface{}, error) { return nil, nil }
 	d.volStatsCache, _ = azcache.NewTimedCache(time.Minute, getter, false)
 	return d
 }
@@ -109,15 +109,15 @@ func TestRun(t *testing.T) {
 	}{
 		{
 			name: "Successful run",
-			testFunc: func(t *testing.T) {
+			testFunc: func(_ *testing.T) {
 				d := NewEmptyDriver("")
 				d.endpoint = "tcp://127.0.0.1:0"
 				d.Run(true)
 			},
 		},
 		{
 			name: "Successful run with node ID missing",
-			testFunc: func(t *testing.T) {
+			testFunc: func(_ *testing.T) {
 				d := NewEmptyDriver("")
 				d.endpoint = "tcp://127.0.0.1:0"
 				d.nodeID = ""
diff --git a/pkg/nfs/nodeserver.go b/pkg/nfs/nodeserver.go
@@ -92,7 +92,7 @@ func (ns *NodeServer) NodePublishVolume(_ context.Context, req *csi.NodePublishV
 			if v != "" {
 				var err error
 				if mountPermissions, err = strconv.ParseUint(v, 8, 32); err != nil {
-					return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid mountPermissions %s", v))
+					return nil, status.Errorf(codes.InvalidArgument, "invalid mountPermissions %s", v)
 				}
 			}
 		}
@@ -213,7 +213,7 @@ func (ns *NodeServer) NodeGetVolumeStats(_ context.Context, req *csi.NodeGetVolu
 	// check if the volume stats is cached
 	cache, err := ns.Driver.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)
diff --git a/pkg/nfs/nodeserver_test.go b/pkg/nfs/nodeserver_test.go
@@ -39,7 +39,7 @@ const (
 func TestNodePublishVolume(t *testing.T) {
 	ns, err := getTestNodeServer()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%v", err.Error())
 	}
 
 	params := map[string]string{
@@ -208,7 +208,7 @@ func TestNodePublishVolume(t *testing.T) {
 func TestNodeUnpublishVolume(t *testing.T) {
 	ns, err := getTestNodeServer()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%v", err.Error())
 	}
 
 	errorTarget := testutil.GetWorkDirPath("error_is_likely_target", t)
@@ -276,7 +276,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
 func TestNodeGetInfo(t *testing.T) {
 	ns, err := getTestNodeServer()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%v", err.Error())
 	}
 
 	// Test valid request
@@ -289,7 +289,7 @@ func TestNodeGetInfo(t *testing.T) {
 func TestNodeGetCapabilities(t *testing.T) {
 	ns, err := getTestNodeServer()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%v", err.Error())
 	}
 
 	capType := &csi.NodeServiceCapability_Rpc{
@@ -358,7 +358,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
 	_ = makeDir(fakePath)
 	ns, err := getTestNodeServer()
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatalf("%v", err.Error())
 	}
 
 	for _, test := range tests {
diff --git a/pkg/nfs/server.go b/pkg/nfs/server.go
@@ -78,7 +78,7 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c
 	if proto == "unix" {
 		addr = "/" + addr
 		if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {
-			klog.Fatalf("Failed to remove %s, error: %s", addr, err.Error())
+			klog.Fatalf("Failed to remove %s, error: %v", addr, err)
 		}
 	}
 
diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go
@@ -38,7 +38,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"},
diff --git a/test/utils/testutil/testutil.go b/test/utils/testutil/testutil.go
@@ -26,7 +26,7 @@ import (
 func GetWorkDirPath(dir string, t *testing.T) string {
 	path, err := os.Getwd()
 	if err != nil {
-		t.Fatalf("failed to get working directory: %s", err)
+		t.Fatalf("failed to get working directory: %v", err)
 	}
 	return fmt.Sprintf("%s%c%s", path, os.PathSeparator, dir)
 }

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,11 @@ func (cs ControllerServer) CreateVolume(ctx context.Context, req csi.CreateVol`
`144`	`144`	`if v != "" {`
`145`	`145`	`var err error`
`146`	`146`	`if mountPermissions, err = strconv.ParseUint(v, 8, 32); err != nil {`
`147`		`- return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid mountPermissions %s in storage class", v))`
	`147`	`+ return nil, status.Errorf(codes.InvalidArgument, "invalid mountPermissions %s in storage class", v)`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`default:`
`151`		`- return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid parameter %q in storage class", k))`
	`151`	`+ return nil, status.Errorf(codes.InvalidArgument, "invalid parameter %q in storage class", k)`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`@@ -168,24 +168,24 @@ func (cs ControllerServer) CreateVolume(ctx context.Context, req csi.CreateVol`
`168`	`168`	`}`
`169`	`169`	`// Mount nfs base share so we can create a subdirectory`
`170`	`170`	`if err = cs.internalMount(ctx, nfsVol, parameters, volCap); err != nil {`
`171`		`- return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err.Error())`
	`171`	`+ return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err)`
`172`	`172`	`}`
`173`	`173`	`defer func() {`
`174`	`174`	`if err = cs.internalUnmount(ctx, nfsVol); err != nil {`
`175`		`- klog.Warningf("failed to unmount nfs server: %v", err.Error())`
	`175`	`+ klog.Warningf("failed to unmount nfs server: %v", err)`
`176`	`176`	`}`
`177`	`177`	`}()`
`178`	`178`
`179`	`179`	`// Create subdirectory under base-dir`
`180`	`180`	`internalVolumePath := getInternalVolumePath(cs.Driver.workingMountDir, nfsVol)`
`181`	`181`	`if err = os.MkdirAll(internalVolumePath, 0777); err != nil {`
`182`		`- return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err.Error())`
	`182`	`+ return nil, status.Errorf(codes.Internal, "failed to make subdirectory: %v", err)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`if mountPermissions > 0 {`
`186`	`186`	`// Reset directory permissions because of umask problems`
`187`	`187`	`if err = os.Chmod(internalVolumePath, os.FileMode(mountPermissions)); err != nil {`
`188`		`- klog.Warningf("failed to chmod subdirectory: %v", err.Error())`
	`188`	`+ klog.Warningf("failed to chmod subdirectory: %v", err)`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`@@ -245,19 +245,19 @@ func (cs ControllerServer) DeleteVolume(ctx context.Context, req csi.DeleteVol`
`245`	`245`	`// check whether volumeID is in the cache`
`246`	`246`	`cache, err := cs.Driver.volDeletionCache.Get(volumeID, azcache.CacheReadTypeDefault)`
`247`	`247`	`if err != nil {`
`248`		`- return nil, status.Errorf(codes.Internal, err.Error())`
	`248`	`+ return nil, status.Errorf(codes.Internal, "%v", err)`
`249`	`249`	`}`
`250`	`250`	`if cache != nil {`
`251`	`251`	`klog.V(2).Infof("DeleteVolume: volume %s is already deleted", volumeID)`
`252`	`252`	`return &csi.DeleteVolumeResponse{}, nil`
`253`	`253`	`}`
`254`	`254`	`// mount nfs base share so we can delete the subdirectory`
`255`	`255`	`if err = cs.internalMount(ctx, nfsVol, nil, volCap); err != nil {`
`256`		`- return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err.Error())`
	`256`	`+ return nil, status.Errorf(codes.Internal, "failed to mount nfs server: %v", err)`
`257`	`257`	`}`
`258`	`258`	`defer func() {`
`259`	`259`	`if err = cs.internalUnmount(ctx, nfsVol); err != nil {`
`260`		`- klog.Warningf("failed to unmount nfs server: %v", err.Error())`
	`260`	`+ klog.Warningf("failed to unmount nfs server: %v", err)`
`261`	`261`	`}`
`262`	`262`	`}()`
`263`	`263`
`@@ -269,7 +269,7 @@ func (cs ControllerServer) DeleteVolume(ctx context.Context, req csi.DeleteVol`
`269`	`269`	`parentDir := filepath.Dir(archivedInternalVolumePath)`
`270`	`270`	`klog.V(2).Infof("DeleteVolume: subdirectory(%s) contains '/', make sure the parent directory(%s) exists", nfsVol.subDir, parentDir)`
`271`	`271`	`if err = os.MkdirAll(parentDir, 0777); err != nil {`
`272`		`- return nil, status.Errorf(codes.Internal, "create parent directory(%s) of %s failed with %v", parentDir, archivedInternalVolumePath, err.Error())`
	`272`	`+ return nil, status.Errorf(codes.Internal, "create parent directory(%s) of %s failed with %v", parentDir, archivedInternalVolumePath, err)`
`273`	`273`	`}`
`274`	`274`	`}`
`275`	`275`
`@@ -278,12 +278,12 @@ func (cs ControllerServer) DeleteVolume(ctx context.Context, req csi.DeleteVol`
`278`	`278`	`if cs.Driver.removeArchivedVolumePath {`
`279`	`279`	`klog.V(2).Infof("removing archived subdirectory at %v", archivedInternalVolumePath)`
`280`	`280`	`if err = os.RemoveAll(archivedInternalVolumePath); err != nil {`
`281`		`- return nil, status.Errorf(codes.Internal, "failed to delete archived subdirectory %s: %v", archivedInternalVolumePath, err.Error())`
	`281`	`+ return nil, status.Errorf(codes.Internal, "failed to delete archived subdirectory %s: %v", archivedInternalVolumePath, err)`
`282`	`282`	`}`
`283`	`283`	`klog.V(2).Infof("removed archived subdirectory at %v", archivedInternalVolumePath)`
`284`	`284`	`}`
`285`	`285`	`if err = os.Rename(internalVolumePath, archivedInternalVolumePath); err != nil {`
`286`		`- return nil, status.Errorf(codes.Internal, "archive subdirectory(%s, %s) failed with %v", internalVolumePath, archivedInternalVolumePath, err.Error())`
	`286`	`+ return nil, status.Errorf(codes.Internal, "archive subdirectory(%s, %s) failed with %v", internalVolumePath, archivedInternalVolumePath, err)`
`287`	`287`	`}`
`288`	`288`	`// make sure internalVolumePath does not exist with 1 minute timeout`
`289`	`289`	`if err = waitForPathNotExistWithTimeout(internalVolumePath, time.Minute); err != nil {`
`@@ -294,7 +294,7 @@ func (cs ControllerServer) DeleteVolume(ctx context.Context, req csi.DeleteVol`
`294`	`294`	`// delete subdirectory under base-dir`
`295`	`295`	`klog.V(2).Infof("removing subdirectory at %v", internalVolumePath)`
`296`	`296`	`if err = os.RemoveAll(internalVolumePath); err != nil {`
`297`		`- return nil, status.Errorf(codes.Internal, "delete subdirectory(%s) failed with %v", internalVolumePath, err.Error())`
	`297`	`+ return nil, status.Errorf(codes.Internal, "delete subdirectory(%s) failed with %v", internalVolumePath, err)`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`	`} else {`
`@@ -455,7 +455,7 @@ func (cs ControllerServer) DeleteSnapshot(ctx context.Context, req csi.DeleteS`
`455`	`455`	`internalVolumePath := getInternalVolumePath(cs.Driver.workingMountDir, vol)`
`456`	`456`	`klog.V(2).Infof("Removing snapshot archive at %v", internalVolumePath)`
`457`	`457`	`if err = os.RemoveAll(internalVolumePath); err != nil {`
`458`		`- return nil, status.Errorf(codes.Internal, "failed to delete subdirectory: %v", err.Error())`
	`458`	`+ return nil, status.Errorf(codes.Internal, "failed to delete subdirectory: %v", err)`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`return &csi.DeleteSnapshotResponse{}, nil`
`@@ -620,7 +620,7 @@ func newNFSSnapshot(name string, params map[string]string, vol nfsVolume) (nfs`
`620`	`620`	`case paramShare:`
`621`	`621`	`baseDir = v`
`622`	`622`	`default:`
`623`		`- return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid parameter %q in snapshot storage class", k))`
	`623`	`+ return nil, status.Errorf(codes.InvalidArgument, "invalid parameter %q in snapshot storage class", k)`
`624`	`624`	`}`
`625`	`625`	`}`
`626`	`626`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func NewDriver(options DriverOptions) Driver {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`var err error`
`120`		`- getter := func(key string) (interface{}, error) { return nil, nil }`
	`120`	`+ getter := func(_ string) (interface{}, error) { return nil, nil }`
`121`	`121`	`if n.volStatsCache, err = azcache.NewTimedCache(time.Duration(options.VolStatsCacheExpireInMinutes)*time.Minute, getter, false); err != nil {`
`122`	`122`	`klog.Fatalf("%v", err)`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func NewEmptyDriver(emptyField string) *Driver {`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`d.volumeLocks = NewVolumeLocks()`
`57`		`- getter := func(key string) (interface{}, error) { return nil, nil }`
	`57`	`+ getter := func(_ string) (interface{}, error) { return nil, nil }`
`58`	`58`	`d.volStatsCache, _ = azcache.NewTimedCache(time.Minute, getter, false)`
`59`	`59`	`return d`
`60`	`60`	`}`
`@@ -109,15 +109,15 @@ func TestRun(t *testing.T) {`
`109`	`109`	`}{`
`110`	`110`	`{`
`111`	`111`	`name: "Successful run",`
`112`		`- testFunc: func(t *testing.T) {`
	`112`	`+ testFunc: func(_ *testing.T) {`
`113`	`113`	`d := NewEmptyDriver("")`
`114`	`114`	`d.endpoint = "tcp://127.0.0.1:0"`
`115`	`115`	`d.Run(true)`
`116`	`116`	`},`
`117`	`117`	`},`
`118`	`118`	`{`
`119`	`119`	`name: "Successful run with node ID missing",`
`120`		`- testFunc: func(t *testing.T) {`
	`120`	`+ testFunc: func(_ *testing.T) {`
`121`	`121`	`d := NewEmptyDriver("")`
`122`	`122`	`d.endpoint = "tcp://127.0.0.1:0"`
`123`	`123`	`d.nodeID = ""`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (ns NodeServer) NodePublishVolume(_ context.Context, req csi.NodePublishV`
`92`	`92`	`if v != "" {`
`93`	`93`	`var err error`
`94`	`94`	`if mountPermissions, err = strconv.ParseUint(v, 8, 32); err != nil {`
`95`		`- return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid mountPermissions %s", v))`
	`95`	`+ return nil, status.Errorf(codes.InvalidArgument, "invalid mountPermissions %s", v)`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`}`
`@@ -213,7 +213,7 @@ func (ns NodeServer) NodeGetVolumeStats(_ context.Context, req csi.NodeGetVolu`
`213`	`213`	`// check if the volume stats is cached`
`214`	`214`	`cache, err := ns.Driver.volStatsCache.Get(req.VolumeId, azcache.CacheReadTypeDefault)`
`215`	`215`	`if err != nil {`
`216`		`- return nil, status.Errorf(codes.Internal, err.Error())`
	`216`	`+ return nil, status.Errorf(codes.Internal, "%v", err)`
`217`	`217`	`}`
`218`	`218`	`if cache != nil {`
`219`	`219`	`resp := cache.(csi.NodeGetVolumeStatsResponse)`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c`
`78`	`78`	`if proto == "unix" {`
`79`	`79`	`addr = "/" + addr`
`80`	`80`	`if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {`
`81`		`- klog.Fatalf("Failed to remove %s, error: %s", addr, err.Error())`
	`81`	`+ klog.Fatalf("Failed to remove %s, error: %v", addr, err)`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ var _ = ginkgo.Describe("Dynamic Provisioning", func() {`
`38`	`38`	`testDriver driver.PVTestDriver`
`39`	`39`	`)`
`40`	`40`
`41`		`- ginkgo.BeforeEach(func(ctx ginkgo.SpecContext) {`
	`41`	`+ ginkgo.BeforeEach(func(_ ginkgo.SpecContext) {`
`42`	`42`	`checkPodsRestart := testCmd{`
`43`	`43`	`command: "sh",`
`44`	`44`	`args: []string{"test/utils/check_driver_pods_restart.sh"},`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`func GetWorkDirPath(dir string, t *testing.T) string {`
`27`	`27`	`path, err := os.Getwd()`
`28`	`28`	`if err != nil {`
`29`		`- t.Fatalf("failed to get working directory: %s", err)`
	`29`	`+ t.Fatalf("failed to get working directory: %v", err)`
`30`	`30`	`}`
`31`	`31`	`return fmt.Sprintf("%s%c%s", path, os.PathSeparator, dir)`
`32`	`32`	`}`