Merge pull request #77 from rollandf/go24

chore: update to go 1.24

Author: adrianchiris

.github/workflows/buildtest.yaml

@@ -9,7 +9,7 @@ jobs:
     name: build
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.24.x]
         os: [ubuntu-22.04]
         goos: [linux]
         goarch: [amd64]
@@ -35,7 +35,7 @@ jobs:
       - name: set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.24.x
       - name: check out code into the Go module directory
         uses: actions/checkout@v3
       - name: run unit-test
@@ -49,7 +49,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.24.x
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
       - name: Go test with coverage

.github/workflows/static-scan.yaml

@@ -8,7 +8,7 @@ jobs:
       - name: set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.24.x
       - name: checkout PR
         uses: actions/checkout@v2
       - name: run make lint

.golangci.yml

@@ -1,4 +1,11 @@
 linters-settings:
+  revive:
+    rules:
+    - name: dot-imports
+      arguments:
+      - allowedPackages:
+        - "github.com/onsi/ginkgo/v2"
+        - "github.com/onsi/gomega"
   dupl:
     threshold: 150
   funlen:
@@ -7,31 +14,14 @@ linters-settings:
   goconst:
     min-len: 2
     min-occurrences: 2
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-    disabled-checks:
-      - dupImport # https://github.com/go-critic/go-critic/issues/845
-      - ifElseChain
-      - octalLiteral
-      - whyNoLint
-      - wrapperFunc
-      - unnamedResult
   gocognit:
     min-complexity: 30
   goimports:
     local-prefixes: github.com/k8snetworkplumbingwg/rdma-cni
-  gomnd:
-    settings:
-      mnd:
-        # don't include the "operation" and "assign"
-        checks: [argument,case,condition,return]
+  mnd:
+    # don't include the "operation" and "assign"
+    checks: [argument,case,condition,return]
   govet:
-    check-shadowing: true
     settings:
       printf:
         funcs:
@@ -53,19 +43,17 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - dupl
     - errcheck
-    - exportloopref
     - funlen
     - gochecknoinits
     - goconst
     - gocritic
     - gocognit
     - gofmt
     - goimports
-    - gomnd
+    - mnd
     - goprintffuncname
     - gosec
     - gosimple
@@ -90,8 +78,8 @@ issues:
   exclude-rules:
     - path: _test\.go
       linters:
-        - gomnd
+        - mnd
         - goconst
     - text: "Magic number: 1"
       linters:
-        - gomnd
+        - mnd

Makefile

@@ -52,7 +52,7 @@ GOLANGCI_LINT = $(BINDIR)/golangci-lint
 # golangci-lint version should be updated periodically
 # we keep it fixed to avoid it from unexpectedly failing on the project
 # in case of a version bump
-GOLANGCI_LINT_VER = v1.51.2
+GOLANGCI_LINT_VER = v1.64.7
 TIMEOUT = 30
 Q = $(if $(filter 1,$V),,@)
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/k8snetworkplumbingwg/rdma-cni
 
-go 1.20
+go 1.24
 
 require (
 	github.com/Mellanox/rdmamap v1.0.0

go.sum

@@ -146,6 +146,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=

pkg/cache/cache.go

@@ -7,6 +7,11 @@ import (
 	"strings"
 )
 
+const (
+	dirPerms  = 0o700
+	filePerms = 0o600
+)
+
 var (
 	// CacheDir is used By default for caching CNI network state
 	CacheDir = "/var/lib/cni/rdma"
@@ -47,14 +52,14 @@ func (sc *FsStateCache) Save(ref StateRef, state interface{}) error {
 	}
 
 	//nolint:gomnd
-	if err = sc.fsOps.MkdirAll(sc.basePath, 0700); err != nil {
+	if err = sc.fsOps.MkdirAll(sc.basePath, dirPerms); err != nil {
 		return fmt.Errorf("failed to create data cache directory(%q): %v", sc.basePath, err)
 	}
 
 	path := filepath.Join(sc.basePath, sRef)
 
 	//nolint:gomnd
-	err = sc.fsOps.WriteFile(path, bytes, 0600)
+	err = sc.fsOps.WriteFile(path, bytes, filePerms)
 	if err != nil {
 		return fmt.Errorf("failed to write cache data in the path(%q): %v", path, err)
 	}