bumps; migrate golangci-lint v2

Author: moukoublen

.golangci.yml

@@ -1,129 +1,115 @@
-# yaml-language-server: $schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json
+# yaml-language-server: https://raw.githubusercontent.com/golangci/golangci-lint/refs/heads/main/jsonschema/golangci.jsonschema.json
 
 # https://golangci-lint.run/usage/configuration/
 # https://golangci-lint.run/usage/linters/
+# https://ldez.github.io/blog/2025/03/23/golangci-lint-v2/
 
+version: "2"
 run:
-  go: '1.24'
-  timeout: 10m
-  issues-exit-code: 1
-  tests: true
+  go: "1.24"
   build-tags:
     - integration
   modules-download-mode: readonly
-
+  issues-exit-code: 1
+  tests: true
 output:
   formats:
-    - format: colored-line-number
+    text:
       path: stderr
-  print-issued-lines: true
-  print-linter-name: true
-
+      print-linter-name: true
+      print-issued-lines: true
+      colors: true
 linters:
-  enable-all: true
+  default: all
+
   disable:
-    - tenv # deprecated
-    - exhaustruct # TODO: reconsider
-    - depguard # TODO: reconsider
-    - funlen # TODO: reconsider
-    - wsl
+    - cyclop
+    - depguard
+    - dupl
+    - exhaustive
+    - exhaustruct
+    - funlen
+    - gochecknoglobals
+    - gocognit
+    - godot
+    - godox
     - lll
-    - wrapcheck
-    - varnamelen
+    - mnd
+    - nlreturn
     - nonamedreturns
+    - perfsprint
+    - tagliatelle
     - testpackage
-    - godox
-    - godot
-    - gochecknoglobals
-    - mnd
-
-issues:
-  # https://golangci-lint.run/usage/false-positives/#default-exclusions
-  exclude-use-default: true
-  include:
-    - EXC0004
-    - EXC0005
-    - EXC0006
-  exclude-rules:
-    - path: '(.+)_test\.go'
-      linters: [gochecknoglobals, goconst, goerr113, dupl, maintidx]
-    - path: '(.+)_test\.go'
-      linters: [govet]
-      text: 'fieldalignment:'
-
-linters-settings:
-  # https://golangci-lint.run/usage/linters/#unused
-  unused:
-    field-writes-are-uses: false
-    post-statements-are-reads: false
-    exported-fields-are-used: true
-    parameters-are-used: true
-    local-variables-are-used: false
-    generated-is-used: true
-
-  # https://golangci-lint.run/usage/linters/#tagliatelle
-  tagliatelle:
-    case:
-      use-field-name: true
+    - unparam
+    - varnamelen
+    - wrapcheck
+    - wsl
+    - funcorder
+
+  settings:
+    staticcheck:
+      checks: ["all", "-QF1008"]
+    nlreturn:
+      block-size: 3
+    nolintlint:
+      allow-unused: true
+    paralleltest:
+      ignore-missing: true
+      ignore-missing-subtests: true
+    revive:
+      severity: error
+      enable-all-rules: false
       rules:
-        # Any struct tag type can be used.
-        # Support string case: `camel`, `pascal`, `kebab`, `snake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`
-        json: snake
-        yaml: camel
-        xml: camel
-        bson: camel
-        avro: snake
-        mapstructure: kebab
-
-  # https://golangci-lint.run/usage/linters/#paralleltest
-  paralleltest:
-    ignore-missing: true
-    ignore-missing-subtests: true
-
-  # https://golangci-lint.run/usage/linters/#nolintlint
-  nolintlint:
-    # Disable to ensure that all nolint directives actually have an effect.
-    # Default: false
-    allow-unused: true
-
-  # https://golangci-lint.run/usage/linters/#nlreturn
-  nlreturn:
-    block-size: 3
-
-  # https://golangci-lint.run/usage/linters/#cyclop
-  cyclop:
-    max-complexity: 20
-    package-average: 0.0
-    skip-tests: true
-
-  # https://golangci-lint.run/usage/linters/#gocyclo
-  gocyclo:
-    min-complexity: 40
-
-  # https://golangci-lint.run/usage/linters/#maintidx
-  maintidx:
-    under: 10
-
-  # https://golangci-lint.run/usage/linters/#govet
-  govet:
-    enable-all: true
-    settings:
-      shadow:
-          strict: false
-    #disable:
-    #  - fieldalignment
-
-  # https://golangci-lint.run/usage/linters/#prealloc
-  prealloc:
-    simple: true
-    range-loops: true
-    for-loops: true
-
-  sloglint:
-    attr-only: true
-    no-global: "all"
-    context: "scope" # report only if a context exists in the scope of the outermost function
-    static-msg: true
-    key-naming-case: snake #  Values: snake, kebab, camel, pascal
-    forbidden-keys:
-      - msg
+        - name: unused-parameter
+          disabled: true
+    tagliatelle:
+      case:
+        rules:
+          avro: snake
+          bson: camel
+          json: snake
+          mapstructure: kebab
+          xml: camel
+          yaml: camel
+        use-field-name: true
+
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - std-error-handling
+    rules:
+      - linters:
+          - dupl
+          - err113
+          - gochecknoglobals
+          - goconst
+          - maintidx
+        path: (.+)_test\.go
+      - linters:
+          - govet
+        path: (.+)_test\.go
+        text: 'fieldalignment:'
+      - linters:
+          - dupl
+          - err113
+          - gochecknoglobals
+          - goconst
+          - maintidx
+        path: internal/tesatingx/testdata
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+
+# https://golangci-lint.run/usage/formatters/
+# https://golangci-lint.run/usage/configuration/#formatters-configuration
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+    #- golines
+  exclusions:
+    generated: lax

.mockery.yml renamed to .mockery.yaml

@@ -58,7 +58,7 @@ env:
 checks: vet staticcheck gofumpt goimports golangci-lint
 
 .PHONY: ci-gen-n-format
-ci-gen-n-format: mockery goimports gofumpt
+ci-gen-n-format: mockery goimports gofumpt golangci-lint-fmt
 	./scripts/git-check-dirty
 
 .PHONY: ci-mod

Makefile

@@ -1,7 +1,6 @@
 package httpx
 
 import (
-	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -13,7 +12,7 @@ import (
 
 func TestAPI_AboutRouteHandler(t *testing.T) {
 	resp := httptest.NewRecorder()
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "/", nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/", nil)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/httpx/router_test.go

@@ -1,3 +1,10 @@
+## https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html
+## in order for
+#.SECONDEXPANSION:
+## https://www.gnu.org/software/make/manual/html_node/Special-Targets.html#index-not-intermediate-targets_002c-explicit
+## NOTINTERMEDIATE requires make >=4.4
+.NOTINTERMEDIATE:
+
 # https://www.gnu.org/software/make/manual/make.html#Automatic-Variables
 # https://www.gnu.org/software/make/manual/make.html#Prerequisite-Types
 
@@ -15,7 +22,8 @@ tools: \
 	$(TOOLS_BIN)/gofumpt \
 	$(TOOLS_BIN)/gojq \
 	$(TOOLS_BIN)/shfmt \
-	$(TOOLS_BIN)/shellcheck
+	$(TOOLS_BIN)/shellcheck \
+	$(TOOLS_BIN)/mockery
 
 .PHONY: clean-tools
 clean-tools:
@@ -35,14 +43,14 @@ $(TOOLS_DB)/%.ver: | $(TOOLS_DB)
 
 define go_install
 	@echo -e "Installing \e[1;36m$(1)\e[0m@\e[1;36m$(3)\e[0m using \e[1;36m$(GO_VER)\e[0m"
-	GOBIN="$(TOOLS_BIN)" CGO_ENABLED=0 go install -trimpath -ldflags '-s -w -extldflags "-static"' "$(2)@$(3)"
+	GOBIN="$(TOOLS_BIN)" CGO_ENABLED=0 go install -tags='$(4)' -trimpath -ldflags '-s -w -extldflags "-static"' "$(2)@$(3)"
 	@echo ""
 endef
 
 # export GOMOD=$(shell pwd)/go_tools.mod
 # go get -modfile='go_tools.mod' -u ...
 define go_mod_ver
-$(shell go list -modfile='./tools/go.mod' -m $(1) | cut -d ' ' -f2)
+$(shell (cd tools && go list -modfile='go.mod' -m $(1) | cut -d ' ' -f2) )
 endef
 
 
@@ -66,14 +74,20 @@ staticcheck: $(TOOLS_BIN)/staticcheck
 
 ## <golangci-lint>
 # https://github.com/golangci/golangci-lint/releases
-GOLANGCI-LINT_MOD:=github.com/golangci/golangci-lint
+GOLANGCI-LINT_MOD:=github.com/golangci/golangci-lint/v2
 GOLANGCI-LINT_VER:=$(call go_mod_ver,$(GOLANGCI-LINT_MOD))
 $(TOOLS_BIN)/golangci-lint: $(TOOLS_DB)/golangci-lint.$(GOLANGCI-LINT_VER).$(GO_VER).ver
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI-LINT_VER)
+	$(call go_install,golangci-lint,$(GOLANGCI-LINT_MOD)/cmd/golangci-lint,$(GOLANGCI-LINT_VER))
+#@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI-LINT_VER)
 
 .PHONY: golangci-lint
 golangci-lint: $(TOOLS_BIN)/golangci-lint
-	golangci-lint run --out-format colored-line-number
+	golangci-lint run
+	@echo ''
+
+.PHONY: golangci-lint-fmt
+golangci-lint-fmt: $(TOOLS_BIN)/golangci-lint
+	golangci-lint fmt
 	@echo ''
 ## </golangci-lint>
 
@@ -152,7 +166,7 @@ $(TOOLS_BIN)/mockery: $(TOOLS_DB)/mockery.$(MOCKERY_VER).$(GO_VER).ver
 .PHONY: mockery
 mockery: $(TOOLS_BIN)/mockery
 	grep --recursive --files-with-matches '// Code generated by mockery' . | grep -v 'scripts/tools.mk' | grep -v 'bin/mockery' | xargs rm || true
-	mockery --config=.mockery.yml
+	mockery --config ./.mockery.yaml
 ## </mockery>
 
 ## <protobuf>