Skip to content

Commit

Permalink
Bump golangci to 1.61
Browse files Browse the repository at this point in the history
  • Loading branch information
kayrus committed Sep 16, 2024
1 parent f5b4265 commit 861e515
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
run:
concurrency: 2
timeout: 10m0s
linters:
enable:
- gofmt
output:
format: line-number
formats:
 - format: line-number
 path: stdout
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmd/manila-csi-plugin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/blockdevice/blockdevice_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 861e515

Please sign in to comment.