Merge pull request cri-o#8835 from saschagrunert/lint-config

Update golangci-lint to v1.62.2 and config
saschagrunert · Dec 11, 2024 · 6fe4033 · 6fe4033
2 parents 8d332ee + c5bdce0
commit 6fe4033
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 75 deletions.
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -11,7 +11,7 @@ on:
   pull_request:
 env:
   GO_VERSION: "1.23"
-  GOLANGCI_LINT_VERSION: v1.62.0
+  GOLANGCI_LINT_VERSION: v1.62.2
 permissions:
   contents: read
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -139,78 +139,10 @@ linters-settings:
         disabled: false
         arguments: [22]
   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
-      - hexLiteral
-      - httpNoBody
-      - hugeParam
-      - importShadow
-      - indexAlloc
-      - initClause
-      - methodExprCall
-      - nestingReduce
-      - nilValReturn
-      - octalLiteral
-      - paramTypeCombine
-      - preferDecodeRune
-      - preferFilepathJoin
-      - preferFprint
-      - preferStringWriter
-      - preferWriteByte
-      - ptrToRefParam
-      - 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
-      # - filepathJoin
-      # - whyNoLint
+    enable-all: true
+    disabled-checks:
+      - filepathJoin
+      - whyNoLint
   gocyclo:
     min-complexity: 177
   nakedret:

diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ GO_MD2MAN ?= ${BUILD_BIN_PATH}/go-md2man
 GINKGO := ${BUILD_BIN_PATH}/ginkgo
 MOCKGEN := ${BUILD_BIN_PATH}/mockgen
 GOLANGCI_LINT := ${BUILD_BIN_PATH}/golangci-lint
-GOLANGCI_LINT_VERSION := v1.62.0
+GOLANGCI_LINT_VERSION := v1.62.2
 GO_MOD_OUTDATED := ${BUILD_BIN_PATH}/go-mod-outdated
 GO_MOD_OUTDATED_VERSION := 0.9.0
 GOSEC := ${BUILD_BIN_PATH}/gosec

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -18,7 +18,7 @@ dependencies:
         match: buildGo123Module
 
   - name: golangci-lint
-    version: v1.62.0
+    version: v1.62.2
     refPaths:
       - path: .github/workflows/verify.yml
         match: GOLANGCI_LINT_VERSION