test: fix golint depguard error

fix golint

golint

fix

Author: andyzhangx

.github/workflows/static.yaml

@@ -16,4 +16,4 @@ jobs:
               uses: golangci/golangci-lint-action@v6
               with:
                   version: v1.64
-                  args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,durationcheck,errname,forbidigo -D=structcheck,typecheck,staticcheck --timeout=30m0s
+                  args: -E=gofmt,unused,ineffassign,revive,misspell,asciicheck,bodyclose,dogsled,durationcheck,errname,forbidigo -D=structcheck,typecheck,staticcheck --timeout=30m0s

pkg/azuredisk/azure_common_windows.go

@@ -95,61 +95,24 @@ func CleanupMountPoint(path string, m *mount.SafeFormatAndMount, unmountVolume b
 }
 
 func getDevicePathWithMountPath(mountPath string, m *mount.SafeFormatAndMount) (string, error) {
-	var devicePath string
-	var err error
-
 	if proxy, ok := m.Interface.(mounter.CSIProxyMounter); ok {
-		devicePath, err = proxy.GetDeviceNameFromMount(mountPath, "")
-	} else {
-		return "", fmt.Errorf("could not cast to csi proxy class")
-	}
-
-	if err != nil {
-		if sts, ok := status.FromError(err); ok {
-			return "", fmt.Errorf(sts.Message())
-		}
-		return "", err
+		return proxy.GetDeviceNameFromMount(mountPath, "")
 	}
-
-	return devicePath, nil
+	return "", fmt.Errorf("could not cast to csi proxy class")
 }
 
 func getBlockSizeBytes(devicePath string, m *mount.SafeFormatAndMount) (int64, error) {
-	var sizeInBytes int64
-	var err error
-
 	if proxy, ok := m.Interface.(mounter.CSIProxyMounter); ok {
-		sizeInBytes, err = proxy.GetVolumeSizeInBytes(devicePath)
-	} else {
-		return -1, fmt.Errorf("could not cast to csi proxy class")
-	}
-
-	if err != nil {
-		if sts, ok := status.FromError(err); ok {
-			return -1, fmt.Errorf(sts.Message())
-		}
-		return -1, err
+		return proxy.GetVolumeSizeInBytes(devicePath)
 	}
-
-	return sizeInBytes, nil
+	return -1, fmt.Errorf("could not cast to csi proxy class")
 }
 
 func resizeVolume(devicePath, volumePath string, m *mount.SafeFormatAndMount) error {
-	var err error
 	if proxy, ok := m.Interface.(mounter.CSIProxyMounter); ok {
-		err = proxy.ResizeVolume(devicePath)
-	} else {
-		return fmt.Errorf("could not cast to csi proxy class")
+		return proxy.ResizeVolume(devicePath)
 	}
-
-	if err != nil {
-		if sts, ok := status.FromError(err); ok {
-			return fmt.Errorf(sts.Message())
-		}
-		return err
-	}
-
-	return nil
+	return fmt.Errorf("could not cast to csi proxy class")
 }
 
 // needResizeVolume check whether device needs resize
@@ -171,7 +134,7 @@ func (d *DriverCore) GetVolumeStats(ctx context.Context, m *mount.SafeFormatAndM
 	// check if the volume stats is cached
 	cache, err := d.volStatsCache.Get(ctx, 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 {
 		volUsage := cache.(csi.VolumeUsage)

pkg/azureutils/azure_disk_utils.go

@@ -441,9 +441,9 @@ func IsValidVolumeCapabilities(volCaps []*csi.VolumeCapability, maxShares int) e
 }
 
 func IsValidAccessModes(volCaps []*csi.VolumeCapability) bool {
-	hasSupport := func(cap *csi.VolumeCapability) bool {
+	hasSupport := func(capability *csi.VolumeCapability) bool {
 		for _, c := range volumeCaps {
-			if c.GetMode() == cap.AccessMode.GetMode() {
+			if c.GetMode() == capability.AccessMode.GetMode() {
 				return true
 			}
 		}

pkg/csi-common/utils.go

@@ -70,21 +70,21 @@ func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *c
 	return &csi.VolumeCapability_AccessMode{Mode: mode}
 }
 
-func NewControllerServiceCapability(cap csi.ControllerServiceCapability_RPC_Type) *csi.ControllerServiceCapability {
+func NewControllerServiceCapability(c csi.ControllerServiceCapability_RPC_Type) *csi.ControllerServiceCapability {
 	return &csi.ControllerServiceCapability{
 		Type: &csi.ControllerServiceCapability_Rpc{
 			Rpc: &csi.ControllerServiceCapability_RPC{
-				Type: cap,
+				Type: c,
 			},
 		},
 	}
 }
 
-func NewNodeServiceCapability(cap csi.NodeServiceCapability_RPC_Type) *csi.NodeServiceCapability {
+func NewNodeServiceCapability(c csi.NodeServiceCapability_RPC_Type) *csi.NodeServiceCapability {
 	return &csi.NodeServiceCapability{
 		Type: &csi.NodeServiceCapability_Rpc{
 			Rpc: &csi.NodeServiceCapability_RPC{
-				Type: cap,
+				Type: c,
 			},
 		},
 	}