Bump golangci to 1.61 (#2664)

Co-authored-by: kayrus <[email protected]>

Author: k8s-infra-cherrypick-robot

.golangci.yaml

@@ -1,7 +1,10 @@
 run:
+  concurrency: 2
   timeout: 10m0s
 linters:
   enable:
     - gofmt
 output:
-  format: line-number
+  formats:
+    - format: line-number
+      path: stdout

Makefile

@@ -81,7 +81,7 @@ $(BUILD_CMDS): $(SOURCES)
 test: unit functional
 
 check: work
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0 run ./...
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 run ./...
 
 unit: work
 	go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)

cmd/manila-csi-plugin/main.go

@@ -71,7 +71,7 @@ func main() {
 		Short: "CSI Manila driver",
 		Run: func(cmd *cobra.Command, args []string) {
 			if err := validateShareProtocolSelector(protoSelector); err != nil {
-				klog.Fatalf(err.Error())
+				klog.Fatal(err.Error())
 			}
 
 			manilaClientBuilder := &manilaclient.ClientBuilder{UserAgent: "manila-csi-plugin", ExtraUserAgentData: userAgentData}

pkg/util/blockdevice/blockdevice_linux.go

@@ -41,7 +41,7 @@ func findBlockDeviceRescanPath(path string) (string, error) {
 	if len(parts) == 3 && strings.HasPrefix(parts[1], "dev") {
 		return filepath.EvalSymlinks(filepath.Join("/sys/block", parts[2], "device", "rescan"))
 	}
-	return "", fmt.Errorf("illegal path for device " + devicePath)
+	return "", fmt.Errorf("illegal path for device %s", devicePath)
 }
 
 // IsBlockDevice checks whether device on the path is a block device
@@ -128,13 +128,13 @@ func RescanBlockDeviceGeometry(devicePath string, deviceMountPath string, newSiz
 func RescanDevice(devicePath string) error {
 	blockDeviceRescanPath, err := findBlockDeviceRescanPath(devicePath)
 	if err != nil {
-		return fmt.Errorf("Device does not have rescan path " + devicePath)
+		return fmt.Errorf("Device does not have rescan path %s", devicePath)
 	}
 
 	klog.V(3).Infof("Resolved block device path from %q to %q", devicePath, blockDeviceRescanPath)
 	err = triggerRescan(blockDeviceRescanPath)
 	if err != nil {
-		return fmt.Errorf("Error rescanning new block device geometry " + devicePath)
+		return fmt.Errorf("Error rescanning new block device geometry %s", devicePath)
 	}
 	return nil
 }