chore: upgrade golangci-lint to v2.2.1

Author: tomMoulard

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v1.62.0
+      GOLANGCI_LINT_VERSION: v2.2.1
       CGO_ENABLED: 0
 
     steps:

.golangci.yml

@@ -1,65 +1,65 @@
+version: "2"
+
 run:
   timeout: 10m
 
-linters-settings:
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment
-  gocyclo:
-    min-complexity: 15
-  goconst:
-    min-len: 5
-    min-occurrences: 3
-  misspell:
-    locale: US
-  funlen:
-    lines: -1
-    statements: 50
-  godox:
-    keywords:
-      - FIXME
-  gofumpt:
-    extra-rules: true
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: "github.com/instana/testify"
-            desc: not allowed
-          - pkg: "github.com/pkg/errors"
-            desc: Should be replaced by standard lib errors package
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - style
-      - performance
-    disabled-checks:
-      - sloppyReassign
-      - rangeValCopy
-      - octalLiteral
-      - paramTypeCombine # already handle by gofumpt.extra-rules
-      - unnamedResult
-      - hugeParam
-  tagliatelle:
-    case:
+linters:
+  settings:
+    govet:
+      enable-all: true
+      disable:
+        - fieldalignment
+    gocyclo:
+      min-complexity: 15
+    goconst:
+      min-len: 5
+      min-occurrences: 3
+    misspell:
+      locale: US
+    funlen:
+      lines: -1
+      statements: 50
+    godox:
+      keywords:
+        - FIXME
+    depguard:
       rules:
-        json: pascal
-  gosec:
-    excludes:
-      - G304
-      - G306
+        main:
+          deny:
+            - pkg: "github.com/instana/testify"
+              desc: not allowed
+            - pkg: "github.com/pkg/errors"
+              desc: Should be replaced by standard lib errors package
+    gocritic:
+      enabled-tags:
+        - diagnostic
+        - style
+        - performance
+      disabled-checks:
+        - sloppyReassign
+        - rangeValCopy
+        - octalLiteral
+        - paramTypeCombine # already handle by gofumpt.extra-rules
+        - unnamedResult
+        - hugeParam
+    tagliatelle:
+      case:
+        rules:
+          json: pascal
+    gosec:
+      excludes:
+        - G304
+        - G306
 
-linters:
-  enable-all: true
+  default: all
   disable:
-    - exportloopref # deprecated
     - sqlclosecheck # not relevant (SQL)
     - rowserrcheck # not relevant (SQL)
     - cyclop # duplicate of gocyclo
     - lll
     - dupl
     - wsl
+    - wsl_v5
     - nlreturn
     - mnd
     - err113
@@ -78,17 +78,35 @@ linters:
     - errchkjson
     - contextcheck
 
+  exclusions:
+    warn-unused: true
+    rules:
+      - text: fmt.Sprintf can be replaced with string
+        linters:
+          - perfsprint
+
 issues:
-  exclude-use-default: false
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude:
-    - 'fmt.Sprintf can be replaced with string'
-  exclude-rules:
-    - path: .*_test.go
-      linters:
-        - funlen
-        - noctx
+
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+    - golines
+
+  settings:
+    gofumpt:
+      extra-rules: true
+
+    golines:
+      max-len: 200
+      tab-len: 4
+      shorten-comments: true
+      reformat-tags: false
+      chain-split-dots: false
 
 output:
   show-stats: true

Makefile

@@ -3,7 +3,7 @@
 default: clean lint test build
 
 lint:
-	golangci-lint run
+	go run github.com/golangci/golangci-lint/v2/cmd/[email protected] run
 
 clean:
 	rm -rf cover.out

syrup.go

@@ -98,6 +98,36 @@ type Syrup struct {
 	Signature     *types.Signature
 }
 
+// Call generates mock.Call wrapper.
+func (s Syrup) Call(writer io.Writer, methods []*types.Func) error {
+	err := s.callBase(writer)
+	if err != nil {
+		return err
+	}
+
+	err = s.typedReturns(writer)
+	if err != nil {
+		return err
+	}
+
+	err = s.returnsFn(writer)
+	if err != nil {
+		return err
+	}
+
+	err = s.typedRun(writer)
+	if err != nil {
+		return err
+	}
+
+	err = s.callMethodsOn(writer, methods)
+	if err != nil {
+		return err
+	}
+
+	return s.callMethodOnRaw(writer, methods)
+}
+
 // MockMethod generates method mocks.
 func (s Syrup) MockMethod(writer io.Writer) error {
 	err := s.mockedMethod(writer)
@@ -312,36 +342,6 @@ func (s Syrup) methodOnRaw(writer io.Writer) error {
 	return w.Err()
 }
 
-// Call generates mock.Call wrapper.
-func (s Syrup) Call(writer io.Writer, methods []*types.Func) error {
-	err := s.callBase(writer)
-	if err != nil {
-		return err
-	}
-
-	err = s.typedReturns(writer)
-	if err != nil {
-		return err
-	}
-
-	err = s.returnsFn(writer)
-	if err != nil {
-		return err
-	}
-
-	err = s.typedRun(writer)
-	if err != nil {
-		return err
-	}
-
-	err = s.callMethodsOn(writer, methods)
-	if err != nil {
-		return err
-	}
-
-	return s.callMethodOnRaw(writer, methods)
-}
-
 func (s Syrup) callBase(writer io.Writer) error {
 	base := template.New("templateCallBase").Funcs(template.FuncMap{
 		"ToGoCamel":  strcase.ToGoCamel,