Merge pull request #270 from prometheus-community/superq/lint

Update golanci-lint

Author: SuperQ

.github/workflows/golangci-lint.yml

@@ -24,16 +24,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
       - name: Install Go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: 1.22.x
+          go-version: 1.25.x
       - name: Install snmp_exporter/generator dependencies
         run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
         if: github.repository == 'prometheus/snmp_exporter'
+      - name: Get golangci-lint version
+        id: golangci-lint-version
+        run: echo "version=$(make print-golangci-lint-version)" >> $GITHUB_OUTPUT
       - name: Lint
-        uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           args: --verbose
-          version: v1.59.1
+          version: ${{ steps.golangci-lint-version.outputs.version }}

.golangci.yml

@@ -1,52 +1,50 @@
-run:
-  skip-dirs:
-    - internal/vendored
+version: "2"
 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
     - bodyclose
     - depguard
     - dogsled
     - errcheck
     - funlen
+    - gochecknoglobals
     - gochecknoinits
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
+    - godot
+    - godox
     - goprintffuncname
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
+    - prealloc
     - rowserrcheck
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - unused
     - whitespace
-    - asciicheck
-    - gochecknoglobals
-    - godot
-    - godox
-    - prealloc
-  # don't enable:
-  # - testpackage
-  # - wsl
-  # - lll
-  # - gomnd
-  # - nestif
-  # - goerr113
-  #
-linters-settings:
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: "golang.org/x/exp/slices"
-            desc: "Use 'slices' instead."
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: golang.org/x/exp/slices
+              desc: Use 'slices' instead.
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - internal/vendored
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax

Makefile

@@ -6,6 +6,7 @@ STATIK_FILES := $(patsubst %, %_statik/statik.go, $(STATIK_SRCS))
 
 BINARYS := $(patsubst cmd/%.go, %, $(MAIN_GO_FILES)) 
 
+GOLANGCI_LINT_VERSION ?= v2.6.0
 
 all: build test 
 
@@ -88,3 +89,7 @@ crossbuild:
 .PHONY: release
 release:
 	goreleaser
+
+.PHONY: golangci-lint-version
+golangci-lint-version:
+	@echo $(GOLANGCI_LINT_VERSION)