Enabled a few more linters

Author: anshuman-agarwala

.golangci.yml

@@ -12,7 +12,7 @@ linters:
     - errchkjson
     - execinquery
     # - gci
-    # - goconst
+    - goconst
     # - gocritic
     - gocyclo
     - godot
@@ -30,17 +30,17 @@ linters:
     - noctx
     - nolintlint
     - nosprintfhostport
-    # - prealloc
-    # - predeclared
+    - prealloc
+    - predeclared
     - reassign
     # - revive
     - rowserrcheck
     - staticcheck
     # - stylecheck
     # - thelper
     - typecheck
-    # - unconvert
-    # - unparam
+    - unconvert
+    - unparam
     - unused
     - usestdlibvars
     - whitespace
@@ -63,8 +63,6 @@ linters-settings:
       - prefix(github.com/IBM)
       - prefix(k8s.io)
       - prefix(sigs.k8s.io)
-      - prefix(sigs.k8s.io/cluster-api)
-      - prefix(sigs.k8s.io/cluster-api-provider-ibmcloud)
       - blank
       - dot
   importas:
@@ -88,10 +86,6 @@ linters-settings:
     allow-unused: false
     # allow-leading-space: false
     require-specific: true
-  staticcheck:
-    go: "1.22"
-  stylecheck:
-    go: "1.22"
   gosec:
     excludes:
       - G307 # Deferring unsafe method "Close" on type "\*os.File"
@@ -116,6 +110,8 @@ linters-settings:
   unused:
     go: "1.22"
 issues:
+  exclude-files:
+    - "zz_generated.*\\.go$"
   max-same-issues: 0
   max-issues-per-linter: 0
   # We are disabling default golangci exclusions because we want to help reviewers to focus on reviewing the most relevant
@@ -202,6 +198,5 @@ run:
   build-tags:
     - tools
     - e2e
-  skip-files:
-    - "zz_generated.*\\.go$"
-  allow-parallel-runners: true
+  allow-parallel-runners: true
+  go: "1.22"

cmd/options_test.go

@@ -27,7 +27,6 @@ func TestGetOptions(t *testing.T) {
 		t *testing.T,
 		additionalArgs []string,
 		withServerOptions bool,
-		withControllerOptions bool,
 		withNodeOptions bool,
 	) *Options {
 		flagSet := flag.NewFlagSet("test-flagset", flag.ContinueOnError)
@@ -85,7 +84,7 @@ func TestGetOptions(t *testing.T) {
 		{
 			name: "no controller mode given - expect all mode",
 			testFunc: func(t *testing.T) {
-				options := testFunc(t, nil, true, true, true)
+				options := testFunc(t, nil, true, true)
 
 				if options.DriverMode != driver.AllMode {
 					t.Fatalf("expected driver mode to be %q but it is %q", driver.AllMode, options.DriverMode)
@@ -96,7 +95,7 @@ func TestGetOptions(t *testing.T) {
 		{
 			name: "all mode given - expect all mode",
 			testFunc: func(t *testing.T) {
-				options := testFunc(t, []string{"all"}, true, true, true)
+				options := testFunc(t, []string{"all"}, true, true)
 
 				if options.DriverMode != driver.AllMode {
 					t.Fatalf("expected driver mode to be %q but it is %q", driver.AllMode, options.DriverMode)
@@ -106,7 +105,7 @@ func TestGetOptions(t *testing.T) {
 		{
 			name: "controller mode given - expect controller mode",
 			testFunc: func(t *testing.T) {
-				options := testFunc(t, []string{"controller"}, true, true, false)
+				options := testFunc(t, []string{"controller"}, true, false)
 
 				if options.DriverMode != driver.ControllerMode {
 					t.Fatalf("expected driver mode to be %q but it is %q", driver.ControllerMode, options.DriverMode)
@@ -116,7 +115,7 @@ func TestGetOptions(t *testing.T) {
 		{
 			name: "node mode given - expect node mode",
 			testFunc: func(t *testing.T) {
-				options := testFunc(t, []string{"node"}, true, false, true)
+				options := testFunc(t, []string{"node"}, true, true)
 
 				if options.DriverMode != driver.NodeMode {
 					t.Fatalf("expected driver mode to be %q but it is %q", driver.NodeMode, options.DriverMode)

pkg/driver/controller.go

@@ -323,7 +323,7 @@ func (d *controllerService) ControllerUnpublishVolume(ctx context.Context, req *
 
 func (d *controllerService) ControllerGetCapabilities(ctx context.Context, req *csi.ControllerGetCapabilitiesRequest) (*csi.ControllerGetCapabilitiesResponse, error) {
 	klog.V(4).Infof("ControllerGetCapabilities: called with args %+v", req)
-	var caps []*csi.ControllerServiceCapability
+	caps := make([]*csi.ControllerServiceCapability, 0, len(controllerCaps))
 	for _, cap := range controllerCaps {
 		c := &csi.ControllerServiceCapability{
 			Type: &csi.ControllerServiceCapability_Rpc{

pkg/driver/node.go

@@ -569,7 +569,7 @@ func (d *nodeService) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetVo
 
 func (d *nodeService) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
 	klog.V(4).Infof("NodeGetCapabilities: called with args %+v", req)
-	var caps []*csi.NodeServiceCapability
+	caps := make([]*csi.NodeServiceCapability, 0, len(nodeCaps))
 	for _, cap := range nodeCaps {
 		c := &csi.NodeServiceCapability{
 			Type: &csi.NodeServiceCapability_Rpc{

pkg/driver/node_test.go

@@ -43,6 +43,7 @@ const (
 	// VolumeAttributePartition represents key for partition config in VolumeContext.
 	// It represents the partition number on a device used to mount.
 	VolumeAttributePartition = "partition"
+	testDir                  = "./test"
 )
 
 var (
@@ -1136,7 +1137,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
 				defer mockCtl.Finish()
 				mockStatUtils := mocks.NewMockStatsUtils(mockCtl)
 
-				volumePath := "./test"
+				volumePath := testDir
 				var mockCapacity int64 = 100
 				mockStatUtils.EXPECT().IsPathNotExist(volumePath).Return(false)
 				mockStatUtils.EXPECT().IsBlockDevice(volumePath).Return(true, nil)
@@ -1161,7 +1162,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
 				defer mockCtl.Finish()
 				mockStatUtils := mocks.NewMockStatsUtils(mockCtl)
 
-				volumePath := "./test"
+				volumePath := testDir
 				mockStatUtils.EXPECT().IsPathNotExist(volumePath).Return(true)
 				driver := &nodeService{stats: mockStatUtils}
 
@@ -1177,7 +1178,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
 				defer mockCtl.Finish()
 				mockStatUtils := mocks.NewMockStatsUtils(mockCtl)
 
-				volumePath := "./test"
+				volumePath := testDir
 				mockStatUtils.EXPECT().IsPathNotExist(volumePath).Return(false)
 				mockStatUtils.EXPECT().IsBlockDevice(volumePath).Return(false, errors.New("Error checking for block device"))
 				driver := &nodeService{stats: mockStatUtils}
@@ -1194,7 +1195,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
 				defer mockCtl.Finish()
 				mockStatUtils := mocks.NewMockStatsUtils(mockCtl)
 
-				volumePath := "./test"
+				volumePath := "testDir"
 				mockStatUtils.EXPECT().IsPathNotExist(volumePath).Return(false)
 				mockStatUtils.EXPECT().IsBlockDevice(volumePath).Return(true, nil)
 				mockStatUtils.EXPECT().DeviceInfo(volumePath).Return(int64(0), errors.New("Error collecting block device info"))
@@ -1214,7 +1215,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
 				defer mockCtl.Finish()
 				mockStatUtils := mocks.NewMockStatsUtils(mockCtl)
 
-				volumePath := "./test"
+				volumePath := "testDir"
 				mockStatUtils.EXPECT().IsPathNotExist(volumePath).Return(false)
 				mockStatUtils.EXPECT().IsBlockDevice(volumePath).Return(false, nil)
 				var statUnit int64 = 0

pkg/driver/sanity_test.go

@@ -212,7 +212,7 @@ func (c *fakeCloudProvider) WaitForVolumeState(volumeID, expectedState string) e
 }
 
 func (c *fakeCloudProvider) GetDiskByName(name string) (*cloud.Disk, error) {
-	var disks []*fakeDisk
+	disks := make([]*fakeDisk, 0, len(c.disks))
 	for _, d := range c.disks {
 		disks = append(disks, d)
 	}

tests/e2e/driver/powervs_csi_driver.go

@@ -84,7 +84,7 @@ func (d *powervsCSIDriver) GetPersistentVolume(volumeID string, fsType string, s
 		Spec: v1.PersistentVolumeSpec{
 			AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce},
 			Capacity: v1.ResourceList{
-				v1.ResourceName(v1.ResourceStorage): resource.MustParse(size),
+				v1.ResourceStorage: resource.MustParse(size),
 			},
 			PersistentVolumeReclaimPolicy: pvReclaimPolicy,
 			PersistentVolumeSource: v1.PersistentVolumeSource{

tests/e2e/testsuites/dynamically_provisioned_resize_volume_tester.go

@@ -68,8 +68,8 @@ func (t *DynamicallyProvisionedResizeVolumeTest) Run(client clientset.Interface,
 
 	updatedSize := updatedPvc.Spec.Resources.Requests["storage"]
 	By("checking the resizing PV result")
-	error := WaitForPvToResize(client, namespace, updatedPvc.Spec.VolumeName, updatedSize, 10*time.Minute, 5*time.Second)
-	framework.ExpectNoError(error)
+	resizeErr := WaitForPvToResize(client, namespace, updatedPvc.Spec.VolumeName, updatedSize, 10*time.Minute, 5*time.Second)
+	framework.ExpectNoError(resizeErr)
 	By("Validate volume can be attached")
 	tpod := NewTestPod(client, namespace, t.Pod.Cmd)
 	tpod.SetupVolume(tpvc.persistentVolumeClaim, volume.VolumeMount.NameGenerate+"1", volume.VolumeMount.MountPathGenerate+"1", volume.VolumeMount.ReadOnly)

tests/e2e/testsuites/testsuites.go

@@ -203,7 +203,7 @@ func generatePVC(namespace, storageClassName, claimSize string, volumeMode v1.Pe
 			},
 			Resources: v1.VolumeResourceRequirements{
 				Requests: v1.ResourceList{
-					v1.ResourceName(v1.ResourceStorage): resource.MustParse(claimSize),
+					v1.ResourceStorage: resource.MustParse(claimSize),
 				},
 			},
 			VolumeMode: &volumeMode,
@@ -221,11 +221,11 @@ func (t *TestPersistentVolumeClaim) ValidateProvisionedPersistentVolume() {
 	framework.ExpectNoError(err)
 
 	// Check sizes
-	expectedCapacity := t.requestedPersistentVolumeClaim.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)]
-	claimCapacity := t.persistentVolumeClaim.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)]
+	expectedCapacity := t.requestedPersistentVolumeClaim.Spec.Resources.Requests[v1.ResourceStorage]
+	claimCapacity := t.persistentVolumeClaim.Spec.Resources.Requests[v1.ResourceStorage]
 	Expect(claimCapacity.Value()).To(Equal(expectedCapacity.Value()), "claimCapacity is not equal to requestedCapacity")
 
-	pvCapacity := t.persistentVolume.Spec.Capacity[v1.ResourceName(v1.ResourceStorage)]
+	pvCapacity := t.persistentVolume.Spec.Capacity[v1.ResourceStorage]
 	Expect(pvCapacity.Value()).To(Equal(expectedCapacity.Value()), "pvCapacity is not equal to requestedCapacity")
 
 	// Check PV properties