upgrade golangci/golangci-lint-action to v1.54

.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

.golangci.yml

@@ -0,0 +1,12 @@
+linters-settings:
+ depguard:
+ rules:
+ main:
+ files:
+ - $all
+ - "!$test"
+ allow:
+ - $gostd
+ - k8s.io
+ - sigs.k8s.io
+ - github.com

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)

pkg/azurefile/azurefile.go

@@ -904,7 +904,7 @@ 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 {
+func (d *Driver) copyFileShare(_ context.Context, 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")
  }

pkg/azurefile/controllerserver.go

@@ -783,19 +783,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 +1083,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, "")
 }
 

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") {

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{
  {

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, "")
 }
 

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
 }
 

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
 }

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() {

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()

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(),

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)

pkg/util/util.go

@@ -126,7 +126,7 @@ func (ac *Azcopy) GetAzcopyJob(dstFileshare string) (AzcopyJobState, string, err
  klog.Warningf("failed to get azcopy job with error: %v, jobState: %v", err, AzcopyJobError)
  return AzcopyJobError, "", fmt.Errorf("couldn't list jobs in azcopy %v", err)
  }
- jobid, jobState, err := parseAzcopyJobList(out, dstFileshare)
+ jobid, jobState, err := parseAzcopyJobList(out)
  if err != nil || jobState == AzcopyJobError {
  klog.Warningf("failed to get azcopy job with error: %v, jobState: %v", err, jobState)
  return AzcopyJobError, "", fmt.Errorf("couldn't parse azcopy job list in azcopy %v", err)
@@ -153,8 +153,8 @@ func (ac *Azcopy) GetAzcopyJob(dstFileshare string) (AzcopyJobState, string, err
  return jobState, percent, nil
 }
 
-// parseAzcopyJobList parse command azcopy jobs list, get jobid and state from joblist containing dstFileShareName
-func parseAzcopyJobList(joblist string, dstFileShareName string) (string, AzcopyJobState, error) {
+// parseAzcopyJobList parse command azcopy jobs list, get jobid and state from joblist
+func parseAzcopyJobList(joblist string) (string, AzcopyJobState, error) {
  jobid := ""
  jobSegments := strings.Split(joblist, "JobId: ")
  if len(jobSegments) < 2 {

pkg/util/util_test.go

@@ -222,8 +222,7 @@ func TestParseAzcopyJobList(t *testing.T) {
  }
 
  for _, test := range tests {
- dstFileShare := "dstFileShare"
- jobid, jobState, err := parseAzcopyJobList(test.str, dstFileShare)
+ jobid, jobState, err := parseAzcopyJobList(test.str)
  if jobid != test.expectedJobid || jobState != test.expectedJobState || !reflect.DeepEqual(err, test.expectedErr) {
  t.Errorf("test[%s]: unexpected jobid: %v, jobState: %v, err: %v, expected jobid: %v, jobState: %v, err: %v", test.desc, jobid, jobState, err, test.expectedJobid, test.expectedJobState, test.expectedErr)
  }

test/e2e/driver/azurefile_driver.go

@@ -58,13 +58,13 @@ func normalizeProvisioner(provisioner string) string {
  return strings.ToLower(strings.ReplaceAll(provisioner, "/", "-"))
 }
 
-func (d *AzureFileDriver) GetDynamicProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, allowedTopologyValues []string, namespace string) *storagev1.StorageClass {
+func (d *AzureFileDriver) GetDynamicProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, _ []string, namespace string) *storagev1.StorageClass {
  provisioner := d.driverName
  generateName := fmt.Sprintf("%s-%s-dynamic-sc-", namespace, normalizeProvisioner(provisioner))
  return getStorageClass(generateName, provisioner, parameters, mountOptions, reclaimPolicy, bindingMode, nil)
 }
 
-func (d *AzureFileDriver) GetPreProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, allowedTopologyValues []string, namespace string) *storagev1.StorageClass {
+func (d *AzureFileDriver) GetPreProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, _ []string, namespace string) *storagev1.StorageClass {
  provisioner := d.driverName
  generateName := fmt.Sprintf("%s-%s-pre-provisioned-sc-", namespace, provisioner)
  return getStorageClass(generateName, provisioner, parameters, mountOptions, reclaimPolicy, bindingMode, nil)

test/e2e/testsuites/specs.go

@@ -141,7 +141,7 @@ func (pod *PodDetails) SetupWithDynamicVolumesWithSubpath(ctx context.Context, c
  return tpod, cleanupFuncs
 }
 
-func (pod *PodDetails) SetupWithInlineVolumes(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver, secretName, shareName string, readOnly bool) (*TestPod, []func()) {
+func (pod *PodDetails) SetupWithInlineVolumes(client clientset.Interface, namespace *v1.Namespace, _ driver.DynamicPVTestDriver, secretName, shareName string, readOnly bool) (*TestPod, []func()) {
  tpod := NewTestPod(client, namespace, pod.Cmd, pod.IsWindows, pod.WinServerVer)
  cleanupFuncs := make([]func(), 0)
  for n, v := range pod.Volumes {
@@ -150,7 +150,7 @@ func (pod *PodDetails) SetupWithInlineVolumes(client clientset.Interface, namesp
  return tpod, cleanupFuncs
 }
 
-func (pod *PodDetails) SetupWithCSIInlineVolumes(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver, secretName, shareName, server string, readOnly bool) (*TestPod, []func()) {
+func (pod *PodDetails) SetupWithCSIInlineVolumes(client clientset.Interface, namespace *v1.Namespace, _ driver.DynamicPVTestDriver, secretName, shareName, server string, readOnly bool) (*TestPod, []func()) {
  tpod := NewTestPod(client, namespace, pod.Cmd, pod.IsWindows, pod.WinServerVer)
  cleanupFuncs := make([]func(), 0)
  for n, v := range pod.Volumes {

test/utils/azure/azure_helpers.go

@@ -72,7 +72,7 @@ func (az *Client) GetAzureFilesClient() (storage.FileSharesClient, error) {
  return az.filesharesClient, nil
 }
 
-func (az *Client) EnsureSSHPublicKey(ctx context.Context, subscriptionID, resourceGroupName, location, keyName string) (publicKey string, err error) {
+func (az *Client) EnsureSSHPublicKey(ctx context.Context, _, resourceGroupName, location, keyName string) (publicKey string, err error) {
  _, err = az.sshPublicKeysClient.Create(ctx, resourceGroupName, keyName, compute.SSHPublicKeyResource{Location: &location})
  if err != nil {
  return "", err
@@ -313,7 +313,7 @@ func getCloudConfig(env azure.Environment) cloud.Configuration {
  }
 }
 
-func getClient(env azure.Environment, subscriptionID, tenantID string, cred *azidentity.ClientSecretCredential, scope string) *Client {
+func getClient(env azure.Environment, subscriptionID, _ string, cred *azidentity.ClientSecretCredential, scope string) *Client {
  c := &Client{
  environment: env,
  subscriptionID: subscriptionID,