chore: upgrade golangci-lint to version 2

retornam · retornam · commit 5f4e391825f8 · 2025-08-22T14:16:28.000-07:00
Upgrade Golang to version to 1.25
diff --git a/.github/workflows/static.yaml b/.github/workflows/static.yaml
@@ -10,10 +10,10 @@ jobs:
             - name: Set up Go 1.x
               uses: actions/setup-go@v5
               with:
-                go-version: ^1.19
+                go-version: ^1.25
             - uses: actions/checkout@master
             - name: Run linter
-              uses: golangci/golangci-lint-action@v6
+              uses: golangci/golangci-lint-action@v8
               with:
-                  version: v1.64
+                  version: v2.4
                   args: -E=gofmt,unused,ineffassign,revive,misspell,copyloopvar,asciicheck,bodyclose,contextcheck,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,12 +1,36 @@
-linters-settings:
-  depguard:
-    rules:
-      main:
-        files:
-          - $all
-          - "!$test"
-        allow:
-          - $gostd
-          - k8s.io
-          - sigs.k8s.io
-          - github.com
+version: "2"
+
+linters:
+  settings:
+    depguard:
+      rules:
+        main:
+          files:
+            - $all
+            - '!$test'
+          allow:
+            - $gostd
+            - k8s.io
+            - sigs.k8s.io
+            - github.com
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - test/utils/azure/azure_helpers.go
+      - vendor$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - vendor$
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kubernetes-csi/csi-driver-smb
 
-go 1.24
+go 1.25
 
 godebug winsymlink=0
 
diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go
@@ -35,7 +35,7 @@ func ParseEndpoint(ep string) (string, string, error) {
 			return s[0], s[1], nil
 		}
 	}
-	return "", "", fmt.Errorf("Invalid endpoint: %v", ep)
+	return "", "", fmt.Errorf("invalid endpoint: %v", ep)
 }
 
 func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
diff --git a/pkg/smb/nodeserver.go b/pkg/smb/nodeserver.go
@@ -516,7 +516,7 @@ func getCredUID(mountFlags []string) (int, error) {
 			return strconv.Atoi(strings.TrimPrefix(mountFlag, cruidPrefix))
 		}
 	}
-	return -1, fmt.Errorf("Can't find credUid in mount flags")
+	return -1, fmt.Errorf("can't find credUid in mount flags")
 }
 
 func getKrb5CcacheName(krb5Prefix string, credUID int) string {
diff --git a/pkg/smb/nodeserver_test.go b/pkg/smb/nodeserver_test.go
@@ -179,12 +179,12 @@ func TestNodeStageVolume(t *testing.T) {
 			skipOnWindows: true,
 			flakyWindowsErrorMessage: fmt.Sprintf("rpc error: code = Internal desc = volume(vol_1##) mount \"%s\" on %#v failed "+
 				"with NewSmbGlobalMapping(%s, %s) failed with error: rpc error: code = Unknown desc = NewSmbGlobalMapping failed.",
-				strings.Replace(testSource, "\\", "\\\\", -1), errorMountSensSource, testSource, errorMountSensSource),
+				strings.ReplaceAll(testSource, "\\", "\\\\"), errorMountSensSource, testSource, errorMountSensSource),
 			expectedErr: testutil.TestError{
 				DefaultError: status.Errorf(codes.Internal,
 					"volume(vol_1##) mount \"%s\" on \"%s\" failed with fake "+
 						"MountSensitive: target error",
-					strings.Replace(testSource, "\\", "\\\\", -1), errorMountSensSource),
+					strings.ReplaceAll(testSource, "\\", "\\\\"), errorMountSensSource),
 			},
 		},
 		{
@@ -196,12 +196,12 @@ func TestNodeStageVolume(t *testing.T) {
 			skipOnWindows: true,
 			flakyWindowsErrorMessage: fmt.Sprintf("rpc error: code = Internal desc = volume(vol_1##) mount \"%s\" on %#v failed "+
 				"with NewSmbGlobalMapping(%s, %s) failed with error: rpc error: code = Unknown desc = NewSmbGlobalMapping failed.",
-				strings.Replace(testSource, "\\", "\\\\", -1), errorMountSensSource, testSource, errorMountSensSource),
+				strings.ReplaceAll(testSource, "\\", "\\\\"), errorMountSensSource, testSource, errorMountSensSource),
 			expectedErr: testutil.TestError{
 				DefaultError: status.Errorf(codes.Internal,
 					"volume(vol_1##) mount \"%s\" on \"%s\" failed with fake "+
 						"MountSensitive: target error",
-					strings.Replace(testSource, "\\", "\\\\", -1), errorMountSensSource),
+					strings.ReplaceAll(testSource, "\\", "\\\\"), errorMountSensSource),
 			},
 		},
 		{
@@ -213,7 +213,7 @@ func TestNodeStageVolume(t *testing.T) {
 			skipOnWindows: true,
 			flakyWindowsErrorMessage: fmt.Sprintf("rpc error: code = Internal desc = volume(vol_1##) mount \"%s\" on %#v failed with "+
 				"NewSmbGlobalMapping(%s, %s) failed with error: rpc error: code = Unknown desc = NewSmbGlobalMapping failed.",
-				strings.Replace(testSource, "\\", "\\\\", -1), sourceTest, testSource, sourceTest),
+				strings.ReplaceAll(testSource, "\\", "\\\\"), sourceTest, testSource, sourceTest),
 			expectedErr: testutil.TestError{},
 		},
 		{
@@ -225,7 +225,7 @@ func TestNodeStageVolume(t *testing.T) {
 			skipOnWindows: true,
 			flakyWindowsErrorMessage: fmt.Sprintf("rpc error: code = Internal desc = volume(vol_1##) mount \"%s\" on %#v failed with "+
 				"NewSmbGlobalMapping(%s, %s) failed with error: rpc error: code = Unknown desc = NewSmbGlobalMapping failed.",
-				strings.Replace(testSource, "\\", "\\\\", -1), sourceTest, testSource, sourceTest),
+				strings.ReplaceAll(testSource, "\\", "\\\\"), sourceTest, testSource, sourceTest),
 			expectedErr: testutil.TestError{},
 		},
 		{
@@ -237,7 +237,7 @@ func TestNodeStageVolume(t *testing.T) {
 			skipOnWindows: true,
 			flakyWindowsErrorMessage: fmt.Sprintf("rpc error: code = Internal desc = volume(vol_1##) mount \"%s\" on %#v failed with "+
 				"NewSmbGlobalMapping(%s, %s) failed with error: rpc error: code = Unknown desc = NewSmbGlobalMapping failed.",
-				strings.Replace(testSource, "\\", "\\\\", -1), sourceTest, testSource, sourceTest),
+				strings.ReplaceAll(testSource, "\\", "\\\\"), sourceTest, testSource, sourceTest),
 			expectedErr: testutil.TestError{},
 		},
 		{
@@ -249,7 +249,7 @@ func TestNodeStageVolume(t *testing.T) {
 			skipOnWindows: true,
 			flakyWindowsErrorMessage: fmt.Sprintf("rpc error: code = Internal desc = volume(vol_1##) mount \"%s\" on %#v failed with "+
 				"NewSmbGlobalMapping(%s, %s) failed with error: rpc error: code = Unknown desc = NewSmbGlobalMapping failed.",
-				strings.Replace(testSource, "\\", "\\\\", -1), sourceTest, testSource, sourceTest),
+				strings.ReplaceAll(testSource, "\\", "\\\\"), sourceTest, testSource, sourceTest),
 			expectedErr: testutil.TestError{},
 		},
 	}
@@ -478,7 +478,7 @@ func TestNodePublishVolume(t *testing.T) {
 	d.mounter = mounter
 
 	for _, test := range tests {
-		if !(test.skipOnWindows && runtime.GOOS == "windows") {
+		if !test.skipOnWindows || runtime.GOOS != "windows" {
 			if test.setup != nil {
 				test.setup(d)
 			}
@@ -543,7 +543,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
 	d.mounter = mounter
 
 	for _, test := range tests {
-		if !(test.skipOnWindows && runtime.GOOS == "windows") {
+		if !test.skipOnWindows || runtime.GOOS != "windows" {
 			if test.setup != nil {
 				test.setup(d)
 			}
@@ -619,7 +619,7 @@ func TestNodeUnstageVolume(t *testing.T) {
 	d.mounter = mounter
 
 	for _, test := range tests {
-		if !(test.skipOnWindows && runtime.GOOS == "windows") {
+		if !test.skipOnWindows || runtime.GOOS != "windows" {
 			if test.setup != nil {
 				test.setup(d)
 			}
diff --git a/pkg/smb/volume_lock.go b/pkg/smb/volume_lock.go
@@ -29,13 +29,13 @@ const (
 // VolumeLocks implements a map with atomic operations. It stores a set of all volume IDs
 // with an ongoing operation.
 type volumeLocks struct {
-	locks sets.String
+	locks sets.Set[string]
 	mux   sync.Mutex
 }
 
 func newVolumeLocks() *volumeLocks {
 	return &volumeLocks{
-		locks: sets.NewString(),
+		locks: sets.New[string](),
 	}
 }
 
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -30,7 +30,6 @@ import (
 
 	"github.com/kubernetes-csi/csi-driver-smb/pkg/smb"
 	"github.com/onsi/ginkgo/v2"
-	"github.com/onsi/ginkgo/v2/reporters"
 	"github.com/onsi/gomega"
 	"github.com/pborman/uuid"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -271,8 +270,10 @@ func TestE2E(t *testing.T) {
 	if reportDir == "" {
 		reportDir = defaultReportDir
 	}
-	r := []ginkgo.Reporter{reporters.NewJUnitReporter(path.Join(reportDir, "junit_01.xml"))}
-	ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "SMB CSI Driver End-to-End Tests", r)
+	// Set the GINKGO_JUNIT_REPORT environment variable to enable JUnit reporting
+	os.Setenv("GINKGO_JUNIT_REPORT", path.Join(reportDir, "junit_01.xml"))
+
+	ginkgo.RunSpecs(t, "SMB CSI Driver End-to-End Tests")
 }
 
 func execTestCmd(cmds []testCmd) {
diff --git a/test/e2e/testsuites/dynamically_provisioned_resize_volume_tester.go b/test/e2e/testsuites/dynamically_provisioned_resize_volume_tester.go
@@ -55,7 +55,7 @@ func (t *DynamicallyProvisionedResizeVolumeTest) Run(ctx context.Context, client
 		ginkgo.By("checking that the pods command exits with no error")
 		tpod.WaitForSuccess(ctx)
 
-		pvcName := tpod.pod.Spec.Volumes[0].VolumeSource.PersistentVolumeClaim.ClaimName
+		pvcName := tpod.pod.Spec.Volumes[0].PersistentVolumeClaim.ClaimName
 		pvc, err := client.CoreV1().PersistentVolumeClaims(namespace.Name).Get(ctx, pvcName, metav1.GetOptions{})
 		if err != nil {
 			framework.ExpectNoError(err, fmt.Sprintf("fail to get original pvc(%s): %v", pvcName, err))
@@ -78,7 +78,7 @@ func (t *DynamicallyProvisionedResizeVolumeTest) Run(ctx context.Context, client
 		time.Sleep(30 * time.Second)
 
 		ginkgo.By("checking the resizing result")
-		newPvc, err := client.CoreV1().PersistentVolumeClaims(namespace.Name).Get(ctx, tpod.pod.Spec.Volumes[0].VolumeSource.PersistentVolumeClaim.ClaimName, metav1.GetOptions{})
+		newPvc, err := client.CoreV1().PersistentVolumeClaims(namespace.Name).Get(ctx, tpod.pod.Spec.Volumes[0].PersistentVolumeClaim.ClaimName, metav1.GetOptions{})
 		if err != nil {
 			framework.ExpectNoError(err, fmt.Sprintf("fail to get new pvc(%s): %v", pvcName, err))
 		}
diff --git a/test/e2e/testsuites/dynamically_provisioned_volume_cloning_tester.go b/test/e2e/testsuites/dynamically_provisioned_volume_cloning_tester.go
@@ -59,7 +59,7 @@ func (t *DynamicallyProvisionedVolumeCloningTest) Run(ctx context.Context, clien
 	ginkgo.By("cloning existing volume")
 	clonedVolume := t.Pod.Volumes[0]
 	clonedVolume.DataSource = &DataSource{
-		Name: tpod.pod.Spec.Volumes[0].VolumeSource.PersistentVolumeClaim.ClaimName,
+		Name: tpod.pod.Spec.Volumes[0].PersistentVolumeClaim.ClaimName,
 		Kind: VolumePVCKind,
 	}
 	clonedVolume.StorageClass = tsc.storageClass
diff --git a/test/e2e/testsuites/testsuites.go b/test/e2e/testsuites/testsuites.go
@@ -186,8 +186,8 @@ func (t *TestPersistentVolumeClaim) ValidateProvisionedPersistentVolume(ctx cont
 	ginkgo.By("checking the PV")
 	expectedAccessModes := t.requestedPersistentVolumeClaim.Spec.AccessModes
 	gomega.Expect(t.persistentVolume.Spec.AccessModes).To(gomega.Equal(expectedAccessModes))
-	gomega.Expect(t.persistentVolume.Spec.ClaimRef.Name).To(gomega.Equal(t.persistentVolumeClaim.ObjectMeta.Name))
-	gomega.Expect(t.persistentVolume.Spec.ClaimRef.Namespace).To(gomega.Equal(t.persistentVolumeClaim.ObjectMeta.Namespace))
+	gomega.Expect(t.persistentVolume.Spec.ClaimRef.Name).To(gomega.Equal(t.persistentVolumeClaim.Name))
+	gomega.Expect(t.persistentVolume.Spec.ClaimRef.Namespace).To(gomega.Equal(t.persistentVolumeClaim.Namespace))
 	// If storageClass is nil, PV was pre-provisioned with these values already set
 	if t.storageClass != nil {
 		gomega.Expect(t.persistentVolume.Spec.PersistentVolumeReclaimPolicy).To(gomega.Equal(*t.storageClass.ReclaimPolicy))
@@ -313,7 +313,7 @@ func (t *TestPersistentVolumeClaim) removeFinalizers(ctx context.Context) {
 	oldData, err := json.Marshal(pvClone)
 	framework.ExpectNoError(err)
 
-	pvClone.ObjectMeta.Finalizers = nil
+	pvClone.Finalizers = nil
 
 	newData, err := json.Marshal(pvClone)
 	framework.ExpectNoError(err)
@@ -450,7 +450,9 @@ func pollForStringInPodsExec(namespace string, pods []string, command []string,
 
 func pollForStringWorker(namespace string, pod string, command []string, expectedString string, ch chan<- error) {
 	args := append([]string{"exec", pod, "--"}, command...)
-	err := wait.PollImmediate(poll, pollForStringTimeout, func() (bool, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), pollForStringTimeout)
+	defer cancel()
+	err := wait.PollUntilContextTimeout(ctx, poll, pollForStringTimeout, true, func(ctx context.Context) (bool, error) {
 		stdout, err := e2ekubectl.RunKubectl(namespace, args...)
 		if err != nil {
 			framework.Logf("Error waiting for output %q in pod %q: %v.", expectedString, pod, err)
diff --git a/test/utils/credentials/credentials.go b/test/utils/credentials/credentials.go
@@ -142,7 +142,7 @@ func CreateAzureCredentialFile(isAzureChinaCloud bool) (*Credentials, error) {
 		return parseAndExecuteTemplate(cloud, c.TenantID, c.SubscriptionID, c.ClientID, c.ClientSecret, resourceGroup, location)
 	}
 
-	return nil, fmt.Errorf("If you are running tests locally, you will need to set the following env vars: $%s, $%s, $%s, $%s, $%s, $%s",
+	return nil, fmt.Errorf("if you are running tests locally, you will need to set the following env vars: $%s, $%s, $%s, $%s, $%s, $%s",
 		tenantIDEnvVar, subscriptionIDEnvVar, aadClientIDEnvVar, aadClientSecretEnvVar, resourceGroupEnvVar, locationEnvVar)
 }
 

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 module github.com/kubernetes-csi/csi-driver-smb
 -go 1.24
 +go 1.25
 godebug winsymlink=0
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func ParseEndpoint(ep string) (string, string, error) {`
`35`	`35`	`return s[0], s[1], nil`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`- return "", "", fmt.Errorf("Invalid endpoint: %v", ep)`
	`38`	`+ return "", "", fmt.Errorf("invalid endpoint: %v", ep)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ func getCredUID(mountFlags []string) (int, error) {`
`516`	`516`	`return strconv.Atoi(strings.TrimPrefix(mountFlag, cruidPrefix))`
`517`	`517`	`}`
`518`	`518`	`}`
`519`		`- return -1, fmt.Errorf("Can't find credUid in mount flags")`
	`519`	`+ return -1, fmt.Errorf("can't find credUid in mount flags")`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`func getKrb5CcacheName(krb5Prefix string, credUID int) string {`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@ const (`
`29`	`29`	`// VolumeLocks implements a map with atomic operations. It stores a set of all volume IDs`
`30`	`30`	`// with an ongoing operation.`
`31`	`31`	`type volumeLocks struct {`
`32`		`- locks sets.String`
	`32`	`+ locks sets.Set[string]`
`33`	`33`	`mux sync.Mutex`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func newVolumeLocks() *volumeLocks {`
`37`	`37`	`return &volumeLocks{`
`38`		`- locks: sets.NewString(),`
	`38`	`+ locks: sets.New[string](),`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (t *DynamicallyProvisionedVolumeCloningTest) Run(ctx context.Context, clien`
`59`	`59`	`ginkgo.By("cloning existing volume")`
`60`	`60`	`clonedVolume := t.Pod.Volumes[0]`
`61`	`61`	`clonedVolume.DataSource = &DataSource{`
`62`		`- Name: tpod.pod.Spec.Volumes[0].VolumeSource.PersistentVolumeClaim.ClaimName,`
	`62`	`+ Name: tpod.pod.Spec.Volumes[0].PersistentVolumeClaim.ClaimName,`
`63`	`63`	`Kind: VolumePVCKind,`
`64`	`64`	`}`
`65`	`65`	`clonedVolume.StorageClass = tsc.storageClass`