Merge pull request #1586 from k8s-infra-cherrypick-robot/cherry-pick-1575-to-release-1.29

andyzhangx · web-flow · commit 6cdfb55986e8 · 2023-11-21T21:44:21.000+08:00
[release-1.29] test: upgrade golangci/golangci-lint-action to v1.54
diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
@@ -15,5 +15,5 @@ jobs:
             - name: Run linter
               uses: golangci/golangci-lint-action@v3
               with:
-                  version: v1.51
-                  args: -E=gofmt,deadcode,unused,varcheck,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,dupl,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
+                  version: v1.54
+                  args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,dupl,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,12 @@
+linters-settings:
+  depguard:
+    rules:
+      main:
+        files:
+          - $all
+          - "!$test"
+        allow:
+          - $gostd
+          - k8s.io
+          - sigs.k8s.io
+          - github.com
diff --git a/pkg/azurefile/azure_common_linux.go b/pkg/azurefile/azure_common_linux.go
@@ -33,20 +33,20 @@ func SMBMount(m *mount.SafeFormatAndMount, source, target, fsType string, option
 	return m.MountSensitive(source, target, fsType, options, sensitiveMountOptions)
 }
 
-func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {
+func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, _ bool) error {
 	return mount.CleanupMountPoint(target, m.Interface, true /*extensiveMountPointCheck*/)
 }
 
-func preparePublishPath(path string, m *mount.SafeFormatAndMount) error {
+func preparePublishPath(_ string, _ *mount.SafeFormatAndMount) error {
 	return nil
 }
 
-func prepareStagePath(path string, m *mount.SafeFormatAndMount) error {
+func prepareStagePath(_ string, _ *mount.SafeFormatAndMount) error {
 	return nil
 }
 
 // GetVolumeStats returns volume stats based on the given path.
-func GetVolumeStats(path string, enableWindowsHostProcess bool) (*csi.NodeGetVolumeStatsResponse, error) {
+func GetVolumeStats(path string, _ bool) (*csi.NodeGetVolumeStatsResponse, error) {
 	volumeMetrics, err := volume.NewMetricsStatFS(path).GetMetrics()
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get metrics: %v", err)
diff --git a/pkg/azurefile/azurefile.go b/pkg/azurefile/azurefile.go
@@ -903,8 +903,8 @@ func (d *Driver) ResizeFileShare(ctx context.Context, subsID, resourceGroup, acc
 	})
 }
 
-// CopyFileShare copies a fileshare in the same storage account
-func (d *Driver) copyFileShare(ctx context.Context, req *csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {
+// copyFileShare copies a fileshare in the same storage account
+func (d *Driver) copyFileShare(req *csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {
 	if shareOptions.Protocol == storage.EnabledProtocolsNFS {
 		return fmt.Errorf("protocol nfs is not supported for volume cloning")
 	}
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -575,7 +575,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "failed to GetStorageAccesskey on account(%s) rg(%s), error: %v", accountOptions.Name, accountOptions.ResourceGroup, err)
 		}
-		if err := d.copyVolume(ctx, req, accountKeyCopy, shareOptions, storageEndpointSuffix); err != nil {
+		if err := d.copyVolume(req, accountKeyCopy, shareOptions, storageEndpointSuffix); err != nil {
 			return nil, err
 		}
 		// storeAccountKey is not needed here since copy volume is only using SAS token
@@ -725,13 +725,14 @@ func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest)
 	return &csi.DeleteVolumeResponse{}, nil
 }
 
-func (d *Driver) copyVolume(ctx context.Context, req *csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {
+// copyVolume copy an azure file
+func (d *Driver) copyVolume(req *csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {
 	vs := req.VolumeContentSource
 	switch vs.Type.(type) {
 	case *csi.VolumeContentSource_Snapshot:
 		return status.Errorf(codes.InvalidArgument, "copy volume from volumeSnapshot is not supported")
 	case *csi.VolumeContentSource_Volume:
-		return d.copyFileShare(ctx, req, accountKey, shareOptions, storageEndpointSuffix)
+		return d.copyFileShare(req, accountKey, shareOptions, storageEndpointSuffix)
 	default:
 		return status.Errorf(codes.InvalidArgument, "%v is not a proper volume source", vs)
 	}
@@ -783,19 +784,19 @@ func (d *Driver) ValidateVolumeCapabilities(ctx context.Context, req *csi.Valida
 }
 
 // ControllerGetCapabilities returns the capabilities of the Controller plugin
-func (d *Driver) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
+func (d *Driver) ControllerGetCapabilities(_ context.Context, _ *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
 	return &csi.ControllerGetCapabilitiesResponse{
 		Capabilities: d.Cap,
 	}, nil
 }
 
 // GetCapacity returns the capacity of the total available storage pool
-func (d *Driver) GetCapacity(ctx context.Context, req *csi.GetCapacityRequest) (*csi.GetCapacityResponse, error) {
+func (d *Driver) GetCapacity(_ context.Context, _ *csi.GetCapacityRequest) (*csi.GetCapacityResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "")
 }
 
 // ListVolumes return all available volumes
-func (d *Driver) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {
+func (d *Driver) ListVolumes(_ context.Context, _ *csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "")
 }
 
@@ -1083,7 +1084,7 @@ func (d *Driver) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequ
 }
 
 // ListSnapshots list all snapshots (todo)
-func (d *Driver) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
+func (d *Driver) ListSnapshots(_ context.Context, _ *csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "")
 }
 
diff --git a/pkg/azurefile/controllerserver_test.go b/pkg/azurefile/controllerserver_test.go
@@ -1646,10 +1646,9 @@ func TestCopyVolume(t *testing.T) {
 				}
 
 				d := NewFakeDriver()
-				ctx := context.Background()
 
 				expectedErr := status.Errorf(codes.InvalidArgument, "copy volume from volumeSnapshot is not supported")
-				err := d.copyVolume(ctx, req, "", nil, "core.windows.net")
+				err := d.copyVolume(req, "", nil, "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
 				}
@@ -1679,10 +1678,9 @@ func TestCopyVolume(t *testing.T) {
 				}
 
 				d := NewFakeDriver()
-				ctx := context.Background()
 
 				expectedErr := fmt.Errorf("protocol nfs is not supported for volume cloning")
-				err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Protocol: storage.EnabledProtocolsNFS}, "core.windows.net")
+				err := d.copyVolume(req, "", &fileclient.ShareOptions{Protocol: storage.EnabledProtocolsNFS}, "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
 				}
@@ -1712,10 +1710,9 @@ func TestCopyVolume(t *testing.T) {
 				}
 
 				d := NewFakeDriver()
-				ctx := context.Background()
 
 				expectedErr := status.Errorf(codes.NotFound, "error parsing volume id: \"unit-test\", should at least contain two #")
-				err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
+				err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
 				}
@@ -1745,10 +1742,9 @@ func TestCopyVolume(t *testing.T) {
 				}
 
 				d := NewFakeDriver()
-				ctx := context.Background()
 
 				expectedErr := fmt.Errorf("srcFileShareName() or dstFileShareName(dstFileshare) is empty")
-				err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
+				err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
 				}
@@ -1778,10 +1774,9 @@ func TestCopyVolume(t *testing.T) {
 				}
 
 				d := NewFakeDriver()
-				ctx := context.Background()
 
 				expectedErr := fmt.Errorf("srcFileShareName(fileshare) or dstFileShareName() is empty")
-				err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{}, "core.windows.net")
+				err := d.copyVolume(req, "", &fileclient.ShareOptions{}, "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
 				}
@@ -1822,10 +1817,8 @@ func TestCopyVolume(t *testing.T) {
 
 				d.azcopy.ExecCmd = m
 
-				ctx := context.Background()
-
 				var expectedErr error
-				err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
+				err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
 				}
@@ -1867,10 +1860,8 @@ func TestCopyVolume(t *testing.T) {
 
 				d.azcopy.ExecCmd = m
 
-				ctx := context.Background()
-
 				var expectedErr error
-				err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
+				err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")
 				if !reflect.DeepEqual(err, expectedErr) {
 					t.Errorf("Unexpected error: %v", err)
 				}
diff --git a/pkg/azurefile/fake_mounter.go b/pkg/azurefile/fake_mounter.go
@@ -30,7 +30,7 @@ type fakeMounter struct {
 }
 
 // Mount overrides mount.FakeMounter.Mount.
-func (f *fakeMounter) Mount(source string, target string, fstype string, options []string) error {
+func (f *fakeMounter) Mount(source string, target string, _ string, _ []string) error {
 	if strings.Contains(source, "error_mount") {
 		return fmt.Errorf("fake Mount: source error")
 	} else if strings.Contains(target, "error_mount") {
@@ -41,7 +41,7 @@ func (f *fakeMounter) Mount(source string, target string, fstype string, options
 }
 
 // MountSensitive overrides mount.FakeMounter.MountSensitive.
-func (f *fakeMounter) MountSensitive(source string, target string, fstype string, options []string, sensitiveOptions []string) error {
+func (f *fakeMounter) MountSensitive(source string, target string, _ string, _ []string, _ []string) error {
 	if strings.Contains(source, "error_mount_sens") {
 		return fmt.Errorf("fake MountSensitive: source error")
 	} else if strings.Contains(target, "error_mount_sens") {
diff --git a/pkg/azurefile/identityserver.go b/pkg/azurefile/identityserver.go
@@ -27,7 +27,7 @@ import (
 )
 
 // GetPluginInfo return the version and name of the plugin
-func (f *Driver) GetPluginInfo(ctx context.Context, req *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {
+func (f *Driver) GetPluginInfo(_ context.Context, _ *csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {
 	if f.Name == "" {
 		return nil, status.Error(codes.Unavailable, "Driver name not configured")
 	}
@@ -46,12 +46,12 @@ func (f *Driver) GetPluginInfo(ctx context.Context, req *csi.GetPluginInfoReques
 // This method does not need to return anything.
 // Currently the spec does not dictate what you should return either.
 // Hence, return an empty response
-func (f *Driver) Probe(ctx context.Context, req *csi.ProbeRequest) (*csi.ProbeResponse, error) {
+func (f *Driver) Probe(_ context.Context, _ *csi.ProbeRequest) (*csi.ProbeResponse, error) {
 	return &csi.ProbeResponse{Ready: &wrappers.BoolValue{Value: true}}, nil
 }
 
 // GetPluginCapabilities returns the capabilities of the plugin
-func (f *Driver) GetPluginCapabilities(ctx context.Context, req *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
+func (f *Driver) GetPluginCapabilities(_ context.Context, _ *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
 	return &csi.GetPluginCapabilitiesResponse{
 		Capabilities: []*csi.PluginCapability{
 			{
diff --git a/pkg/azurefile/nodeserver.go b/pkg/azurefile/nodeserver.go
@@ -120,7 +120,7 @@ func (d *Driver) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolu
 }
 
 // NodeUnpublishVolume unmount the volume from the target path
-func (d *Driver) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
+func (d *Driver) NodeUnpublishVolume(_ context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
 	if len(req.GetVolumeId()) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "Volume ID missing in request")
 	}
@@ -382,7 +382,7 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 }
 
 // NodeUnstageVolume unmount the volume from the staging path
-func (d *Driver) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
+func (d *Driver) NodeUnstageVolume(_ context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
 	volumeID := req.GetVolumeId()
 	if len(volumeID) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "Volume ID missing in request")
@@ -420,21 +420,21 @@ func (d *Driver) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolu
 }
 
 // NodeGetCapabilities return the capabilities of the Node plugin
-func (d *Driver) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
+func (d *Driver) NodeGetCapabilities(_ context.Context, _ *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
 	return &csi.NodeGetCapabilitiesResponse{
 		Capabilities: d.NSCap,
 	}, nil
 }
 
 // NodeGetInfo return info of the node on which this plugin is running
-func (d *Driver) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
+func (d *Driver) NodeGetInfo(_ context.Context, _ *csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {
 	return &csi.NodeGetInfoResponse{
 		NodeId: d.NodeID,
 	}, nil
 }
 
 // NodeGetVolumeStats get volume stats
-func (d *Driver) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {
+func (d *Driver) NodeGetVolumeStats(_ context.Context, req *csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {
 	if len(req.VolumeId) == 0 {
 		return nil, status.Error(codes.InvalidArgument, "NodeGetVolumeStats volume ID was empty")
 	}
@@ -513,7 +513,7 @@ func (d *Driver) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetVolumeS
 
 // NodeExpandVolume node expand volume
 // N/A for azure file
-func (d *Driver) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {
+func (d *Driver) NodeExpandVolume(_ context.Context, _ *csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "")
 }
 
diff --git a/pkg/azurefile/utils.go b/pkg/azurefile/utils.go
@@ -197,11 +197,11 @@ func (l *VolumeMounter) CanMount() error {
 	return nil
 }
 
-func (l *VolumeMounter) SetUp(mounterArgs volume.MounterArgs) error {
+func (l *VolumeMounter) SetUp(_ volume.MounterArgs) error {
 	return nil
 }
 
-func (l *VolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterArgs) error {
+func (l *VolumeMounter) SetUpAt(_ string, _ volume.MounterArgs) error {
 	return nil
 }
 
diff --git a/pkg/azurefile/utils_test.go b/pkg/azurefile/utils_test.go
@@ -62,7 +62,7 @@ func TestConcurrentLockEntry(t *testing.T) {
 	testLockMap.UnlockEntry("entry1")
 }
 
-func (lm *lockMap) lockAndCallback(t *testing.T, entry string, callbackChan chan<- interface{}) {
+func (lm *lockMap) lockAndCallback(_ *testing.T, entry string, callbackChan chan<- interface{}) {
 	lm.LockEntry(entry)
 	callbackChan <- true
 }
diff --git a/pkg/azurefileplugin/main.go b/pkg/azurefileplugin/main.go
@@ -131,7 +131,7 @@ func exportMetrics() {
 	serve(context.Background(), l, serveMetrics)
 }
 
-func serve(ctx context.Context, l net.Listener, serveFunc func(net.Listener) error) {
+func serve(_ context.Context, l net.Listener, serveFunc func(net.Listener) error) {
 	path := l.Addr().String()
 	klog.V(2).Infof("set up prometheus server on %v", path)
 	go func() {
diff --git a/pkg/csi-common/server_test.go b/pkg/csi-common/server_test.go
@@ -30,15 +30,15 @@ func TestNewNonBlockingGRPCServer(t *testing.T) {
 	assert.NotNil(t, s)
 }
 
-func TestStart(t *testing.T) {
+func TestStart(_ *testing.T) {
 	s := NewNonBlockingGRPCServer()
 	// sleep a while to avoid race condition in unit test
 	time.Sleep(time.Millisecond * 500)
 	s.Start("tcp://127.0.0.1:0", nil, nil, nil, true)
 	time.Sleep(time.Millisecond * 500)
 }
 
-func TestServe(t *testing.T) {
+func TestServe(_ *testing.T) {
 	s := nonBlockingGRPCServer{}
 	s.server = grpc.NewServer()
 	s.wg = sync.WaitGroup{}
@@ -47,20 +47,20 @@ func TestServe(t *testing.T) {
 	s.serve("tcp://127.0.0.1:0", nil, nil, nil, true)
 }
 
-func TestWait(t *testing.T) {
+func TestWait(_ *testing.T) {
 	s := nonBlockingGRPCServer{}
 	s.server = grpc.NewServer()
 	s.wg = sync.WaitGroup{}
 	s.Wait()
 }
 
-func TestStop(t *testing.T) {
+func TestStop(_ *testing.T) {
 	s := nonBlockingGRPCServer{}
 	s.server = grpc.NewServer()
 	s.Stop()
 }
 
-func TestForceStop(t *testing.T) {
+func TestForceStop(_ *testing.T) {
 	s := nonBlockingGRPCServer{}
 	s.server = grpc.NewServer()
 	s.ForceStop()
diff --git a/pkg/mounter/safe_mounter_unix.go b/pkg/mounter/safe_mounter_unix.go
@@ -24,7 +24,7 @@ import (
 	utilexec "k8s.io/utils/exec"
 )
 
-func NewSafeMounter(enableWindowsHostProcess bool) (*mount.SafeFormatAndMount, error) {
+func NewSafeMounter(_ bool) (*mount.SafeFormatAndMount, error) {
 	return &mount.SafeFormatAndMount{
 		Interface: mount.New(""),
 		Exec:      utilexec.New(),
diff --git a/pkg/os/filesystem/filesystem.go b/pkg/os/filesystem/filesystem.go
@@ -80,7 +80,7 @@ func PathExists(path string) (bool, error) {
 	return pathExists(path)
 }
 
-func PathValid(ctx context.Context, path string) (bool, error) {
+func PathValid(_ context.Context, path string) (bool, error) {
 	cmd := `Test-Path $Env:remotepath`
 	cmdEnv := fmt.Sprintf("remotepath=%s", path)
 	output, err := util.RunPowershellCmd(cmd, cmdEnv)
diff --git a/pkg/util/util.go b/pkg/util/util.go
diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go
diff --git a/test/e2e/driver/azurefile_driver.go b/test/e2e/driver/azurefile_driver.go
diff --git a/test/e2e/testsuites/dynamically_provisioned_inline_volume.go b/test/e2e/testsuites/dynamically_provisioned_inline_volume.go
diff --git a/test/e2e/testsuites/specs.go b/test/e2e/testsuites/specs.go
diff --git a/test/utils/azure/azure_helpers.go b/test/utils/azure/azure_helpers.go

Original file line number	Diff line number	Diff line change
`@@ -33,20 +33,20 @@ func SMBMount(m *mount.SafeFormatAndMount, source, target, fsType string, option`
`33`	`33`	`return m.MountSensitive(source, target, fsType, options, sensitiveMountOptions)`
`34`	`34`	`}`
`35`	`35`
`36`		`-func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, extensiveMountCheck bool) error {`
	`36`	`+func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, _ bool) error {`
`37`	`37`	`return mount.CleanupMountPoint(target, m.Interface, true /extensiveMountPointCheck/)`
`38`	`38`	`}`
`39`	`39`
`40`		`-func preparePublishPath(path string, m *mount.SafeFormatAndMount) error {`
	`40`	`+func preparePublishPath(_ string, _ *mount.SafeFormatAndMount) error {`
`41`	`41`	`return nil`
`42`	`42`	`}`
`43`	`43`
`44`		`-func prepareStagePath(path string, m *mount.SafeFormatAndMount) error {`
	`44`	`+func prepareStagePath(_ string, _ *mount.SafeFormatAndMount) error {`
`45`	`45`	`return nil`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// GetVolumeStats returns volume stats based on the given path.`
`49`		`-func GetVolumeStats(path string, enableWindowsHostProcess bool) (*csi.NodeGetVolumeStatsResponse, error) {`
	`49`	`+func GetVolumeStats(path string, _ bool) (*csi.NodeGetVolumeStatsResponse, error) {`
`50`	`50`	`volumeMetrics, err := volume.NewMetricsStatFS(path).GetMetrics()`
`51`	`51`	`if err != nil {`
`52`	`52`	`return nil, status.Errorf(codes.Internal, "failed to get metrics: %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -903,8 +903,8 @@ func (d *Driver) ResizeFileShare(ctx context.Context, subsID, resourceGroup, acc`
`903`	`903`	`})`
`904`	`904`	`}`
`905`	`905`
`906`		`-// CopyFileShare copies a fileshare in the same storage account`
`907`		`-func (d Driver) copyFileShare(ctx context.Context, req csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {`
	`906`	`+// copyFileShare copies a fileshare in the same storage account`
	`907`	`+func (d Driver) copyFileShare(req csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {`
`908`	`908`	`if shareOptions.Protocol == storage.EnabledProtocolsNFS {`
`909`	`909`	`return fmt.Errorf("protocol nfs is not supported for volume cloning")`
`910`	`910`	`}`
Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ func (d Driver) CreateVolume(ctx context.Context, req csi.CreateVolumeRequest)`
`575`	`575`	`if err != nil {`
`576`	`576`	`return nil, status.Errorf(codes.Internal, "failed to GetStorageAccesskey on account(%s) rg(%s), error: %v", accountOptions.Name, accountOptions.ResourceGroup, err)`
`577`	`577`	`}`
`578`		`- if err := d.copyVolume(ctx, req, accountKeyCopy, shareOptions, storageEndpointSuffix); err != nil {`
	`578`	`+ if err := d.copyVolume(req, accountKeyCopy, shareOptions, storageEndpointSuffix); err != nil {`
`579`	`579`	`return nil, err`
`580`	`580`	`}`
`581`	`581`	`// storeAccountKey is not needed here since copy volume is only using SAS token`
`@@ -725,13 +725,14 @@ func (d Driver) DeleteVolume(ctx context.Context, req csi.DeleteVolumeRequest)`
`725`	`725`	`return &csi.DeleteVolumeResponse{}, nil`
`726`	`726`	`}`
`727`	`727`
`728`		`-func (d Driver) copyVolume(ctx context.Context, req csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {`
	`728`	`+// copyVolume copy an azure file`
	`729`	`+func (d Driver) copyVolume(req csi.CreateVolumeRequest, accountKey string, shareOptions *fileclient.ShareOptions, storageEndpointSuffix string) error {`
`729`	`730`	`vs := req.VolumeContentSource`
`730`	`731`	`switch vs.Type.(type) {`
`731`	`732`	`case *csi.VolumeContentSource_Snapshot:`
`732`	`733`	`return status.Errorf(codes.InvalidArgument, "copy volume from volumeSnapshot is not supported")`
`733`	`734`	`case *csi.VolumeContentSource_Volume:`
`734`		`- return d.copyFileShare(ctx, req, accountKey, shareOptions, storageEndpointSuffix)`
	`735`	`+ return d.copyFileShare(req, accountKey, shareOptions, storageEndpointSuffix)`
`735`	`736`	`default:`
`736`	`737`	`return status.Errorf(codes.InvalidArgument, "%v is not a proper volume source", vs)`
`737`	`738`	`}`
`@@ -783,19 +784,19 @@ func (d Driver) ValidateVolumeCapabilities(ctx context.Context, req csi.Valida`
`783`	`784`	`}`
`784`	`785`
`785`	`786`	`// ControllerGetCapabilities returns the capabilities of the Controller plugin`
`786`		`-func (d Driver) ControllerGetCapabilities(ctx context.Context, req csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {`
	`787`	`+func (d Driver) ControllerGetCapabilities(_ context.Context, _ csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {`
`787`	`788`	`return &csi.ControllerGetCapabilitiesResponse{`
`788`	`789`	`Capabilities: d.Cap,`
`789`	`790`	`}, nil`
`790`	`791`	`}`
`791`	`792`
`792`	`793`	`// GetCapacity returns the capacity of the total available storage pool`
`793`		`-func (d Driver) GetCapacity(ctx context.Context, req csi.GetCapacityRequest) (*csi.GetCapacityResponse, error) {`
	`794`	`+func (d Driver) GetCapacity(_ context.Context, _ csi.GetCapacityRequest) (*csi.GetCapacityResponse, error) {`
`794`	`795`	`return nil, status.Error(codes.Unimplemented, "")`
`795`	`796`	`}`
`796`	`797`
`797`	`798`	`// ListVolumes return all available volumes`
`798`		`-func (d Driver) ListVolumes(ctx context.Context, req csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {`
	`799`	`+func (d Driver) ListVolumes(_ context.Context, _ csi.ListVolumesRequest) (*csi.ListVolumesResponse, error) {`
`799`	`800`	`return nil, status.Error(codes.Unimplemented, "")`
`800`	`801`	`}`
`801`	`802`
`@@ -1083,7 +1084,7 @@ func (d Driver) DeleteSnapshot(ctx context.Context, req csi.DeleteSnapshotRequ`
`1083`	`1084`	`}`
`1084`	`1085`
`1085`	`1086`	`// ListSnapshots list all snapshots (todo)`
`1086`		`-func (d Driver) ListSnapshots(ctx context.Context, req csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {`
	`1087`	`+func (d Driver) ListSnapshots(_ context.Context, _ csi.ListSnapshotsRequest) (*csi.ListSnapshotsResponse, error) {`
`1087`	`1088`	`return nil, status.Error(codes.Unimplemented, "")`
`1088`	`1089`	`}`
`1089`	`1090`
Original file line number	Diff line number	Diff line change
`@@ -1646,10 +1646,9 @@ func TestCopyVolume(t *testing.T) {`
`1646`	`1646`	`}`
`1647`	`1647`
`1648`	`1648`	`d := NewFakeDriver()`
`1649`		`- ctx := context.Background()`
`1650`	`1649`
`1651`	`1650`	`expectedErr := status.Errorf(codes.InvalidArgument, "copy volume from volumeSnapshot is not supported")`
`1652`		`- err := d.copyVolume(ctx, req, "", nil, "core.windows.net")`
	`1651`	`+ err := d.copyVolume(req, "", nil, "core.windows.net")`
`1653`	`1652`	`if !reflect.DeepEqual(err, expectedErr) {`
`1654`	`1653`	`t.Errorf("Unexpected error: %v", err)`
`1655`	`1654`	`}`
`@@ -1679,10 +1678,9 @@ func TestCopyVolume(t *testing.T) {`
`1679`	`1678`	`}`
`1680`	`1679`
`1681`	`1680`	`d := NewFakeDriver()`
`1682`		`- ctx := context.Background()`
`1683`	`1681`
`1684`	`1682`	`expectedErr := fmt.Errorf("protocol nfs is not supported for volume cloning")`
`1685`		`- err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Protocol: storage.EnabledProtocolsNFS}, "core.windows.net")`
	`1683`	`+ err := d.copyVolume(req, "", &fileclient.ShareOptions{Protocol: storage.EnabledProtocolsNFS}, "core.windows.net")`
`1686`	`1684`	`if !reflect.DeepEqual(err, expectedErr) {`
`1687`	`1685`	`t.Errorf("Unexpected error: %v", err)`
`1688`	`1686`	`}`
`@@ -1712,10 +1710,9 @@ func TestCopyVolume(t *testing.T) {`
`1712`	`1710`	`}`
`1713`	`1711`
`1714`	`1712`	`d := NewFakeDriver()`
`1715`		`- ctx := context.Background()`
`1716`	`1713`
`1717`	`1714`	`expectedErr := status.Errorf(codes.NotFound, "error parsing volume id: \"unit-test\", should at least contain two #")`
`1718`		`- err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
	`1715`	`+ err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
`1719`	`1716`	`if !reflect.DeepEqual(err, expectedErr) {`
`1720`	`1717`	`t.Errorf("Unexpected error: %v", err)`
`1721`	`1718`	`}`
`@@ -1745,10 +1742,9 @@ func TestCopyVolume(t *testing.T) {`
`1745`	`1742`	`}`
`1746`	`1743`
`1747`	`1744`	`d := NewFakeDriver()`
`1748`		`- ctx := context.Background()`
`1749`	`1745`
`1750`	`1746`	`expectedErr := fmt.Errorf("srcFileShareName() or dstFileShareName(dstFileshare) is empty")`
`1751`		`- err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
	`1747`	`+ err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
`1752`	`1748`	`if !reflect.DeepEqual(err, expectedErr) {`
`1753`	`1749`	`t.Errorf("Unexpected error: %v", err)`
`1754`	`1750`	`}`
`@@ -1778,10 +1774,9 @@ func TestCopyVolume(t *testing.T) {`
`1778`	`1774`	`}`
`1779`	`1775`
`1780`	`1776`	`d := NewFakeDriver()`
`1781`		`- ctx := context.Background()`
`1782`	`1777`
`1783`	`1778`	`expectedErr := fmt.Errorf("srcFileShareName(fileshare) or dstFileShareName() is empty")`
`1784`		`- err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{}, "core.windows.net")`
	`1779`	`+ err := d.copyVolume(req, "", &fileclient.ShareOptions{}, "core.windows.net")`
`1785`	`1780`	`if !reflect.DeepEqual(err, expectedErr) {`
`1786`	`1781`	`t.Errorf("Unexpected error: %v", err)`
`1787`	`1782`	`}`
`@@ -1822,10 +1817,8 @@ func TestCopyVolume(t *testing.T) {`
`1822`	`1817`
`1823`	`1818`	`d.azcopy.ExecCmd = m`
`1824`	`1819`
`1825`		`- ctx := context.Background()`
`1826`		`-`
`1827`	`1820`	`var expectedErr error`
`1828`		`- err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
	`1821`	`+ err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
`1829`	`1822`	`if !reflect.DeepEqual(err, expectedErr) {`
`1830`	`1823`	`t.Errorf("Unexpected error: %v", err)`
`1831`	`1824`	`}`
`@@ -1867,10 +1860,8 @@ func TestCopyVolume(t *testing.T) {`
`1867`	`1860`
`1868`	`1861`	`d.azcopy.ExecCmd = m`
`1869`	`1862`
`1870`		`- ctx := context.Background()`
`1871`		`-`
`1872`	`1863`	`var expectedErr error`
`1873`		`- err := d.copyVolume(ctx, req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
	`1864`	`+ err := d.copyVolume(req, "", &fileclient.ShareOptions{Name: "dstFileshare"}, "core.windows.net")`
`1874`	`1865`	`if !reflect.DeepEqual(err, expectedErr) {`
`1875`	`1866`	`t.Errorf("Unexpected error: %v", err)`
`1876`	`1867`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// GetPluginInfo return the version and name of the plugin`
`30`		`-func (f Driver) GetPluginInfo(ctx context.Context, req csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {`
	`30`	`+func (f Driver) GetPluginInfo(_ context.Context, _ csi.GetPluginInfoRequest) (*csi.GetPluginInfoResponse, error) {`
`31`	`31`	`if f.Name == "" {`
`32`	`32`	`return nil, status.Error(codes.Unavailable, "Driver name not configured")`
`33`	`33`	`}`
`@@ -46,12 +46,12 @@ func (f Driver) GetPluginInfo(ctx context.Context, req csi.GetPluginInfoReques`
`46`	`46`	`// This method does not need to return anything.`
`47`	`47`	`// Currently the spec does not dictate what you should return either.`
`48`	`48`	`// Hence, return an empty response`
`49`		`-func (f Driver) Probe(ctx context.Context, req csi.ProbeRequest) (*csi.ProbeResponse, error) {`
	`49`	`+func (f Driver) Probe(_ context.Context, _ csi.ProbeRequest) (*csi.ProbeResponse, error) {`
`50`	`50`	`return &csi.ProbeResponse{Ready: &wrappers.BoolValue{Value: true}}, nil`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// GetPluginCapabilities returns the capabilities of the plugin`
`54`		`-func (f Driver) GetPluginCapabilities(ctx context.Context, req csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {`
	`54`	`+func (f Driver) GetPluginCapabilities(_ context.Context, _ csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {`
`55`	`55`	`return &csi.GetPluginCapabilitiesResponse{`
`56`	`56`	`Capabilities: []*csi.PluginCapability{`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (d Driver) NodePublishVolume(ctx context.Context, req csi.NodePublishVolu`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`// NodeUnpublishVolume unmount the volume from the target path`
`123`		`-func (d Driver) NodeUnpublishVolume(ctx context.Context, req csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {`
	`123`	`+func (d Driver) NodeUnpublishVolume(_ context.Context, req csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {`
`124`	`124`	`if len(req.GetVolumeId()) == 0 {`
`125`	`125`	`return nil, status.Error(codes.InvalidArgument, "Volume ID missing in request")`
`126`	`126`	`}`
`@@ -382,7 +382,7 @@ func (d Driver) NodeStageVolume(ctx context.Context, req csi.NodeStageVolumeRe`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`// NodeUnstageVolume unmount the volume from the staging path`
`385`		`-func (d Driver) NodeUnstageVolume(ctx context.Context, req csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {`
	`385`	`+func (d Driver) NodeUnstageVolume(_ context.Context, req csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {`
`386`	`386`	`volumeID := req.GetVolumeId()`
`387`	`387`	`if len(volumeID) == 0 {`
`388`	`388`	`return nil, status.Error(codes.InvalidArgument, "Volume ID missing in request")`
`@@ -420,21 +420,21 @@ func (d Driver) NodeUnstageVolume(ctx context.Context, req csi.NodeUnstageVolu`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`// NodeGetCapabilities return the capabilities of the Node plugin`
`423`		`-func (d Driver) NodeGetCapabilities(ctx context.Context, req csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {`
	`423`	`+func (d Driver) NodeGetCapabilities(_ context.Context, _ csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {`
`424`	`424`	`return &csi.NodeGetCapabilitiesResponse{`
`425`	`425`	`Capabilities: d.NSCap,`
`426`	`426`	`}, nil`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`// NodeGetInfo return info of the node on which this plugin is running`
`430`		`-func (d Driver) NodeGetInfo(ctx context.Context, req csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {`
	`430`	`+func (d Driver) NodeGetInfo(_ context.Context, _ csi.NodeGetInfoRequest) (*csi.NodeGetInfoResponse, error) {`
`431`	`431`	`return &csi.NodeGetInfoResponse{`
`432`	`432`	`NodeId: d.NodeID,`
`433`	`433`	`}, nil`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`// NodeGetVolumeStats get volume stats`
`437`		`-func (d Driver) NodeGetVolumeStats(ctx context.Context, req csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {`
	`437`	`+func (d Driver) NodeGetVolumeStats(_ context.Context, req csi.NodeGetVolumeStatsRequest) (*csi.NodeGetVolumeStatsResponse, error) {`
`438`	`438`	`if len(req.VolumeId) == 0 {`
`439`	`439`	`return nil, status.Error(codes.InvalidArgument, "NodeGetVolumeStats volume ID was empty")`
`440`	`440`	`}`
`@@ -513,7 +513,7 @@ func (d Driver) NodeGetVolumeStats(ctx context.Context, req csi.NodeGetVolumeS`
`513`	`513`
`514`	`514`	`// NodeExpandVolume node expand volume`
`515`	`515`	`// N/A for azure file`
`516`		`-func (d Driver) NodeExpandVolume(ctx context.Context, req csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {`
	`516`	`+func (d Driver) NodeExpandVolume(_ context.Context, _ csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {`
`517`	`517`	`return nil, status.Error(codes.Unimplemented, "")`
`518`	`518`	`}`
`519`	`519`
Original file line number	Diff line number	Diff line change
`@@ -197,11 +197,11 @@ func (l *VolumeMounter) CanMount() error {`
`197`	`197`	`return nil`
`198`	`198`	`}`
`199`	`199`
`200`		`-func (l *VolumeMounter) SetUp(mounterArgs volume.MounterArgs) error {`
	`200`	`+func (l *VolumeMounter) SetUp(_ volume.MounterArgs) error {`
`201`	`201`	`return nil`
`202`	`202`	`}`
`203`	`203`
`204`		`-func (l *VolumeMounter) SetUpAt(dir string, mounterArgs volume.MounterArgs) error {`
	`204`	`+func (l *VolumeMounter) SetUpAt(_ string, _ volume.MounterArgs) error {`
`205`	`205`	`return nil`
`206`	`206`	`}`
`207`	`207`