scripts/ci: upgrade golangci-lint

- Upgrade golangci-lint to version 1.52.2 to address OOM issues (golangci/golangci-lint#3538) - Fix issues detected by the new version of golangci-lint Signed-off-by: Xin Yang <Xin.Yang@arm.com> Change-Id: I489d7d7b7b3c7b44e4566bee16a3ed5a2a990aef Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk-csi/+/17968 Reviewed-by: Yibo Cai <yibo.cai@arm.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Antti Kervinen <antti.kervinen@intel.com> Reviewed-by: Jing Yan <jing1.yan@intel.com>
spdk · May 8, 2023 · c1b7ebc · c1b7ebc
1 parent 929a2a3
commit c1b7ebc
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ OUT_DIR := ./_out
 # dir for tools: e.g., golangci-lint
 TOOL_DIR := $(OUT_DIR)/tool
 # use golangci-lint for static code check
-GOLANGCI_VERSION := v1.49.0
+GOLANGCI_VERSION := v1.52.2
 GOLANGCI_BIN := $(TOOL_DIR)/golangci-lint
 # go source, scripts
 SOURCE_DIRS := cmd pkg

diff --git a/e2e/utils.go b/e2e/utils.go
@@ -281,7 +281,7 @@ func execCommandInPod(f *framework.Framework, c, ns string, opt *metav1.ListOpti
 	if stdErr != "" {
 		e2elog.Logf("stdErr occurred: %v", stdErr)
 	}
-	Expect(err).Should(BeNil())
+	Expect(err).ShouldNot(HaveOccurred())
 	return stdOut, stdErr
 }
 
@@ -290,7 +290,7 @@ func getCommandInPodOpts(f *framework.Framework, c, ns string, opt *metav1.ListO
 	podList, err := f.PodClientNS(ns).List(ctx, *opt)
 	framework.ExpectNoError(err)
 	Expect(podList.Items).NotTo(BeNil())
-	Expect(err).Should(BeNil())
+	Expect(err).ShouldNot(HaveOccurred())
 
 	return framework.ExecOptions{
 		Command:            cmd,

diff --git a/pkg/csi-common/controllerserver-default.go b/pkg/csi-common/controllerserver-default.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+//nolint:revive // csi spec
 package csicommon
 
 import (

diff --git a/pkg/csi-common/identityserver-default.go b/pkg/csi-common/identityserver-default.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+//nolint:revive // csi spec
 package csicommon
 
 import (

diff --git a/pkg/csi-common/nodeserver-default.go b/pkg/csi-common/nodeserver-default.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+//nolint:revive // csi spec
 package csicommon
 
 import (

diff --git a/pkg/spdk/controllerserver.go b/pkg/spdk/controllerserver.go
@@ -53,7 +53,7 @@ type volume struct {
 	mtx       sync.Mutex // per volume lock to serialize DeleteVolume requests
 }
 
-func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) {
+func (cs *controllerServer) CreateVolume(_ context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) {
 	// be idempotent to duplicated requests
 	volume, err := func() (*volume, error) {
 		const creatingTag = "__CREATING__"
@@ -120,7 +120,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 	return &csi.CreateVolumeResponse{Volume: &volume.csiVolume}, nil
 }
 
-func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
+func (cs *controllerServer) DeleteVolume(_ context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
 	volumeID := req.GetVolumeId()
 	cs.mtx.Lock()
 	volume, exists := cs.volumes[volumeID]
@@ -168,7 +168,7 @@ func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
 	return &csi.DeleteVolumeResponse{}, nil
 }
 
-func (cs *controllerServer) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
+func (cs *controllerServer) ValidateVolumeCapabilities(_ context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
 	// make sure we support all requested caps
 	for _, cap := range req.VolumeCapabilities {
 		supported := false
@@ -189,7 +189,7 @@ func (cs *controllerServer) ValidateVolumeCapabilities(ctx context.Context, req
 	}, nil
 }
 
-func (cs *controllerServer) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
+func (cs *controllerServer) ControllerGetVolume(_ context.Context, req *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
 	volumeID := req.GetVolumeId()
 
 	cs.mtx.Lock()
@@ -204,7 +204,7 @@ func (cs *controllerServer) ControllerGetVolume(ctx context.Context, req *csi.Co
 	return &csi.ControllerGetVolumeResponse{Volume: &volume.csiVolume}, nil
 }
 
-func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
+func (cs *controllerServer) CreateSnapshot(_ context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
 	lvolID := req.GetSourceVolumeId()
 	snapshotName := req.GetName()
 
@@ -251,7 +251,7 @@ func (cs *controllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
 	}, nil
 }
 
-func (cs *controllerServer) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
+func (cs *controllerServer) DeleteSnapshot(_ context.Context, req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
 	snapshotID := req.SnapshotId
 	cs.mtxSnapshot.RLock()
 	exSnap, exists := cs.snapshotsIdem[snapshotID]

diff --git a/pkg/spdk/identityserver.go b/pkg/spdk/identityserver.go
@@ -34,7 +34,7 @@ func newIdentityServer(d *csicommon.CSIDriver) *identityServer {
 	}
 }
 
-func (ids *identityServer) GetPluginCapabilities(ctx context.Context, req *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
+func (ids *identityServer) GetPluginCapabilities(_ context.Context, _ *csi.GetPluginCapabilitiesRequest) (*csi.GetPluginCapabilitiesResponse, error) {
 	return &csi.GetPluginCapabilitiesResponse{
 		Capabilities: []*csi.PluginCapability{
 			{

diff --git a/pkg/spdk/nodeserver.go b/pkg/spdk/nodeserver.go
@@ -129,7 +129,7 @@ func newNodeServer(d *csicommon.CSIDriver) (*nodeServer, error) {
 	return ns, nil
 }
 
-func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
+func (ns *nodeServer) NodeStageVolume(_ context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
 	volume, err := func() (*nodeVolume, error) {
 		volumeID := req.GetVolumeId()
 		ns.mtx.Lock()
@@ -181,7 +181,7 @@ func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol
 	return nil, status.Error(codes.Aborted, "concurrent request ongoing")
 }
 
-func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
+func (ns *nodeServer) NodeUnstageVolume(_ context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
 	volumeID := req.GetVolumeId()
 	ns.mtx.Lock()
 	volume, exists := ns.volumes[volumeID]
@@ -221,7 +221,7 @@ func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 	return &csi.NodeUnstageVolumeResponse{}, nil
 }
 
-func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
+func (ns *nodeServer) NodePublishVolume(_ context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
 	volumeID := req.GetVolumeId()
 	ns.mtx.Lock()
 	volume, exists := ns.volumes[volumeID]
@@ -245,7 +245,7 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 	return nil, status.Error(codes.Aborted, "concurrent request ongoing")
 }
 
-func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
+func (ns *nodeServer) NodeUnpublishVolume(_ context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
 	volumeID := req.GetVolumeId()
 	ns.mtx.Lock()
 	volume, exists := ns.volumes[volumeID]
@@ -266,7 +266,7 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
 	return nil, status.Error(codes.Aborted, "concurrent request ongoing")
 }
 
-func (ns *nodeServer) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
+func (ns *nodeServer) NodeGetCapabilities(_ context.Context, _ *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
 	return &csi.NodeGetCapabilitiesResponse{
 		Capabilities: []*csi.NodeServiceCapability{
 			{

diff --git a/pkg/util/jsonrpc.go b/pkg/util/jsonrpc.go
@@ -266,7 +266,6 @@ func (client *rpcClient) call(method string, args, result interface{}) error {
 	}
 
 	defer resp.Body.Close()
-	//nolint:usestdlibvars // >= 400 rather than >= http.StatusBadRequest
 	if resp.StatusCode >= 400 {
 		return fmt.Errorf("%s: HTTP error code: %d", method, resp.StatusCode)
 	}