fix

kubernetes-sigs · Nov 20, 2023 · 2b9d08a · 2b9d08a
1 parent e60393e
commit 2b9d08a
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
@@ -16,4 +16,4 @@ jobs:
  uses: golangci/golangci-lint-action@v3
  with:
  version: v1.54
- args: -E=gofmt,deadcode,unused,varcheck,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,dupl,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
+ args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,dupl,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
diff --git a/pkg/azurefile/azure_common_linux.go b/pkg/azurefile/azure_common_linux.go
@@ -37,16 +37,16 @@ func CleanupMountPoint(m *mount.SafeFormatAndMount, target string, _ bool) error
  return mount.CleanupMountPoint(target, m.Interface, true /*extensiveMountPointCheck*/)
 }
 
-func preparePublishPath(_ string, m *mount.SafeFormatAndMount) error {
+func preparePublishPath(_ string, _ *mount.SafeFormatAndMount) error {
  return nil
 }
 
-func prepareStagePath(_ 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
@@ -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")
  }

diff --git a/pkg/azurefile/controllerserver.go b/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, "")
 }
 

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, _ 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, _ string, options []st
 }
 
 // MountSensitive overrides mount.FakeMounter.MountSensitive.
-func (f *fakeMounter) MountSensitive(source string, target string, _ 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(_ 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(_ context.Context, req *csi.GetPluginInfoRequest)
 // 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(_ 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(_ 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
@@ -201,7 +201,7 @@ func (l *VolumeMounter) SetUp(_ volume.MounterArgs) error {
  return nil
 }
 
-func (l *VolumeMounter) SetUpAt(dir string, _ volume.MounterArgs) error {
+func (l *VolumeMounter) SetUpAt(_ string, _ volume.MounterArgs) error {
  return nil
 }
 

diff --git a/test/e2e/testsuites/specs.go b/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 {