Merge pull request k8snetworkplumbingwg#121 from SchSeba/multiple_bumps

multiple bumps: golang version, golangci-lint v2, update lint config, fix lint issues

Author: zeeke

.github/workflows/buildtest.yaml

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

.github/workflows/static-scan.yaml

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

.golangci.yml

@@ -1,86 +1,123 @@
-linters-settings:
-  revive:
-    rules:
-    - name: dot-imports
-      arguments:
-      - allowedPackages:
-        - "github.com/onsi/ginkgo/v2"
-        - "github.com/onsi/gomega"
-  dupl:
-    threshold: 150
-  funlen:
-    lines: 100
-    statements: 50
-  goconst:
-    min-len: 2
-    min-occurrences: 2
-  gocognit:
-    min-complexity: 30
-  goimports:
-    local-prefixes: github.com/k8snetworkplumbingwg/rdma-cni
-  mnd:
-    # don't include the "operation" and "assign"
-    checks: [argument,case,condition,return]
-  govet:
-    settings:
-      printf:
-        funcs:
-          - (github.com/rs/zerolog/zerolog.Event).Msgf
-  lll:
-    line-length: 120
-  misspell:
-    locale: US
-  prealloc:
-    # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them.
-    # True by default.
-    simple: true
-    range-loops: true # Report preallocation suggestions on range loops, true by default
-    for-loops: false # Report preallocation suggestions on for loops, false by default
+# Tested with golangci-lint ver. 2.x
+version: "2"
+
+run:
+  timeout: 10m
 
 linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
+  default: none
   enable:
+    - asciicheck        # checks for non-ASCII identifiers
+    - bidichk           # checks for dangerous unicode sequences (security)
     - bodyclose
+    - copyloopvar
+    - depguard
     - dogsled
     - dupl
     - errcheck
+    - errname           # checks error naming conventions
+    - exhaustive
     - funlen
+    - gocheckcompilerdirectives  # validates go compiler directives
     - gochecknoinits
+    - gocognit
     - goconst
     - gocritic
-    - gocognit
-    - gofmt
-    - goimports
-    - mnd
     - goprintffuncname
     - gosec
-    - gosimple
+    - staticcheck
     - govet
     - ineffassign
     - lll
+    - makezero          # finds slice declarations with non-zero initial length
     - misspell
+    - mnd
     - nakedret
     - prealloc
+    - reassign          # checks package variable reassignment
     - revive
-    - rowserrcheck
-    - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - whitespace
 
-issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - mnd
-        - goconst
-        - dupl
-    - text: "Magic number: 1"
-      linters:
-        - mnd
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: github.com/sirupsen/logrus
+              desc: "logging is allowed only by logutils.Log"
+    revive:
+      rules:
+        - name: dot-imports
+          arguments:
+            - allowedPackages:
+                - "github.com/onsi/ginkgo/v2"
+                - "github.com/onsi/gomega"
+    dupl:
+      threshold: 150
+    funlen:
+      lines: 100
+      statements: 50
+    goconst:
+      min-len: 2
+      min-occurrences: 2
+    gocognit:
+      min-complexity: 30
+    govet:
+      settings:
+        printf:
+          funcs:
+            - (github.com/rs/zerolog/zerolog.Event).Msgf
+    lll:
+      line-length: 120
+    misspell:
+      locale: US
+    mnd:
+      checks:
+        - argument
+        - case
+        - condition
+        - return
+    prealloc:
+      simple: true
+      range-loops: true
+      for-loops: false
+    staticcheck:
+      checks:
+        - all
+        - -QF1001
+        - -QF1003
+        - -QF1008
+      dot-import-whitelist:
+        - github.com/onsi/ginkgo/v2
+        - github.com/onsi/gomega
+
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - std-error-handling
+    paths:
+      - vendor/
+      - .github/
+      - images/
+    rules:
+      - path: _test\.go
+        linters:
+          - mnd
+          - goconst
+          - dupl
+      - text: "Magic number: 1"
+        linters:
+          - mnd
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/k8snetworkplumbingwg/rdma-cni

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS builder
 
 ARG TARGETPLATFORM
 ARG TARGETARCH

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.64.7
+GOLANGCI_LINT_VER = v2.7.2
 MOCKERY_VERSION ?= v3.5.4
 TIMEOUT = 30
 Q = $(if $(filter 1,$V),,@)
@@ -73,8 +73,8 @@ $(BUILDDIR)/$(BINARY_NAME): $(GOFILES) | $(BUILDDIR)
 	@$(GO_BUILD_OPTS) go build -o $(BUILDDIR)/$(BINARY_NAME) $(GO_TAGS) -ldflags $(LDFLAGS) -v cmd/rdma/main.go
 
 # Tools
-$(GOLANGCI_LINT): ; $(info  building golangci-lint...)
-	$Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BINDIR) $(GOLANGCI_LINT_VER)
+$(GOLANGCI_LINT): | $(BINDIR) ; $(info  installing golangci-lint...)
+	$Q GOBIN=$(BINDIR) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VER)
 
 MOCKERY= $(BINDIR)/mockery
 $(MOCKERY): ; $(info  building mockery...)

go.mod

@@ -1,6 +1,6 @@
 module github.com/k8snetworkplumbingwg/rdma-cni
 
-go 1.24.2
+go 1.25.3
 
 require (
 	github.com/Mellanox/rdmamap v1.1.0

pkg/cache/fs_ops.go

@@ -27,7 +27,7 @@ type FileSystemOps interface {
 type stdFileSystemOps struct{}
 
 func (sfs *stdFileSystemOps) ReadFile(filename string) ([]byte, error) {
-	return os.ReadFile(filename)
+	return os.ReadFile(filename) //nolint:gosec
 }
 
 func (sfs *stdFileSystemOps) WriteFile(filename string, data []byte, perm os.FileMode) error {