Update linter and fix linting issues

Author: ciarams87

.github/workflows/lint.yml

@@ -33,9 +33,9 @@ jobs:
           go-version: stable
 
       - name: Lint Go
-        uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
+        uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
         with:
-          version: v1.64.8 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.1.5 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   actionlint:
     name: Actionlint

.golangci.yml

@@ -1,44 +1,6 @@
-linters-settings:
-  misspell:
-    locale: US
-  revive:
-    ignore-generated-header: true
-    rules:
-      - name: blank-imports
-      - name: constant-logical-expr
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: defer
-      - name: dot-imports
-      - name: duplicated-imports
-      - name: empty-block
-      - name: error-naming
-      - name: error-return
-      - name: error-strings
-      - name: errorf
-      - name: exported
-      - name: import-shadowing
-      - name: increment-decrement
-      - name: indent-error-flow
-      - name: package-comments
-      - name: range
-      - name: range-val-address
-      - name: range-val-in-closure
-      - name: receiver-naming
-      - name: redefines-builtin-id
-      - name: string-of-int
-      - name: superfluous-else
-      - name: time-naming
-      - name: unchecked-type-assertion
-      - name: unexported-return
-      - name: unnecessary-stmt
-      - name: unreachable-code
-      - name: unused-parameter
-      - name: var-declaration
-      - name: var-naming
-  govet:
-    enable-all: true
+version: "2"
 linters:
+  default: none
   enable:
     - asasalint
     - asciicheck
@@ -59,11 +21,7 @@ linters:
     - gochecksumtype
     - gocritic
     - godot
-    - gofmt
-    - gofumpt
-    - goimports
     - gosec
-    - gosimple
     - gosmopolitan
     - govet
     - ineffassign
@@ -75,29 +33,84 @@ linters:
     - nilerr
     - noctx
     - nolintlint
+    - paralleltest
     - perfsprint
     - prealloc
     - predeclared
-    - paralleltest
     - reassign
     - revive
     - staticcheck
-    - stylecheck
     - tagalign
-    - tenv
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - unused
     - usestdlibvars
     - wastedassign
     - whitespace
     - wrapcheck
-  disable-all: true
+  settings:
+    govet:
+      enable-all: true
+    misspell:
+      locale: US
+    revive:
+      rules:
+        - name: blank-imports
+        - name: constant-logical-expr
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: defer
+        - name: dot-imports
+        - name: duplicated-imports
+        - name: empty-block
+        - name: error-naming
+        - name: error-return
+        - name: error-strings
+        - name: errorf
+        - name: exported
+        - name: import-shadowing
+        - name: increment-decrement
+        - name: indent-error-flow
+        - name: package-comments
+        - name: range
+        - name: range-val-address
+        - name: range-val-in-closure
+        - name: receiver-naming
+        - name: redefines-builtin-id
+        - name: string-of-int
+        - name: superfluous-else
+        - name: time-naming
+        - name: unchecked-type-assertion
+        - name: unexported-return
+        - name: unnecessary-stmt
+        - name: unreachable-code
+        - name: unused-parameter
+        - name: var-declaration
+        - name: var-naming
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-run:
-  timeout: 5m
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.64.8
+    rev: v2.0.2
     hooks:
       - id: golangci-lint-full
 

Makefile

@@ -1,10 +1,10 @@
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION = v1.64.8
+GOLANGCI_LINT_VERSION = v2.1.5
 
 test: unit-test test-integration test-integration-no-stream-block clean
 
 lint:
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) run --fix
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) run --fix
 
 unit-test:
 	go test -v -shuffle=on -race client/*.go

client/nginx_test.go

@@ -677,8 +677,8 @@ func TestClientWithMaxAPI(t *testing.T) {
 			t.Parallel()
 			// Test creating a new client with max API version
 			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				switch {
-				case r.RequestURI == "/":
+				switch r.RequestURI {
+				case "/":
 					_, err := w.Write([]byte(tt.apiVersions))
 					if err != nil {
 						t.Fatalf("unexpected error: %v", err)
@@ -852,8 +852,8 @@ func TestGetStats_SSL(t *testing.T) {
 func TestGetMaxAPIVersionServer(t *testing.T) {
 	t.Parallel()
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch {
-		case r.RequestURI == "/":
+		switch r.RequestURI {
+		case "/":
 			_, err := w.Write([]byte(`[4, 5, 6, 7]`))
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)
@@ -884,8 +884,8 @@ func TestGetMaxAPIVersionServer(t *testing.T) {
 func TestGetMaxAPIVersionClient(t *testing.T) {
 	t.Parallel()
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		switch {
-		case r.RequestURI == "/":
+		switch r.RequestURI {
+		case "/":
 			_, err := w.Write([]byte(`[4, 5, 6, 7, 8, 9, 25]`))
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)