diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml index 85af7d16b..a67d3e0c9 100644 --- a/.github/workflows/static.yaml +++ b/.github/workflows/static.yaml @@ -15,5 +15,5 @@ jobs: - name: Run linter uses: golangci/golangci-lint-action@v4 with: - version: v1.60 - args: -E=gofmt,unused,ineffassign,revive,misspell,exportloopref,asciicheck,bodyclose,depguard,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s + version: v1.64 + args: -E=gofmt,unused,ineffassign,revive,misspell,asciicheck,bodyclose,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s diff --git a/pkg/csi-common/driver.go b/pkg/csi-common/driver.go index b252172cc..9c969e3b6 100644 --- a/pkg/csi-common/driver.go +++ b/pkg/csi-common/driver.go @@ -65,8 +65,8 @@ func (d *CSIDriver) ValidateControllerServiceRequest(c csi.ControllerServiceCapa return nil } - for _, cap := range d.Cap { - if c == cap.GetRpc().GetType() { + for _, capability := range d.Cap { + if c == capability.GetRpc().GetType() { return nil } } diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go index 21f5889c9..85c2e430c 100644 --- a/pkg/csi-common/utils.go +++ b/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, }, }, } diff --git a/pkg/csi-common/utils_test.go b/pkg/csi-common/utils_test.go index 720e5f1e9..b9d4563ff 100644 --- a/pkg/csi-common/utils_test.go +++ b/pkg/csi-common/utils_test.go @@ -178,29 +178,29 @@ func TestLogGRPC(t *testing.T) { func TestNewControllerServiceCapability(t *testing.T) { tests := []struct { - cap csi.ControllerServiceCapability_RPC_Type + c csi.ControllerServiceCapability_RPC_Type }{ { - cap: csi.ControllerServiceCapability_RPC_UNKNOWN, + c: csi.ControllerServiceCapability_RPC_UNKNOWN, }, { - cap: csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME, + c: csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME, }, { - cap: csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME, + c: csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME, }, { - cap: csi.ControllerServiceCapability_RPC_LIST_VOLUMES, + c: csi.ControllerServiceCapability_RPC_LIST_VOLUMES, }, { - cap: csi.ControllerServiceCapability_RPC_GET_CAPACITY, + c: csi.ControllerServiceCapability_RPC_GET_CAPACITY, }, { - cap: csi.ControllerServiceCapability_RPC_CLONE_VOLUME, + c: csi.ControllerServiceCapability_RPC_CLONE_VOLUME, }, } for _, test := range tests { - resp := NewControllerServiceCapability(test.cap) + resp := NewControllerServiceCapability(test.c) assert.NotNil(t, resp) assert.Equal(t, resp.XXX_sizecache, int32(0)) } @@ -208,23 +208,23 @@ func TestNewControllerServiceCapability(t *testing.T) { func TestNewNodeServiceCapability(t *testing.T) { tests := []struct { - cap csi.NodeServiceCapability_RPC_Type + c csi.NodeServiceCapability_RPC_Type }{ { - cap: csi.NodeServiceCapability_RPC_UNKNOWN, + c: csi.NodeServiceCapability_RPC_UNKNOWN, }, { - cap: csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME, + c: csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME, }, { - cap: csi.NodeServiceCapability_RPC_GET_VOLUME_STATS, + c: csi.NodeServiceCapability_RPC_GET_VOLUME_STATS, }, { - cap: csi.NodeServiceCapability_RPC_EXPAND_VOLUME, + c: csi.NodeServiceCapability_RPC_EXPAND_VOLUME, }, } for _, test := range tests { - resp := NewNodeServiceCapability(test.cap) + resp := NewNodeServiceCapability(test.c) assert.NotNil(t, resp) assert.Equal(t, resp.XXX_sizecache, int32(0)) }