Migrate Linter config to v2

Signed-off-by: Vincent Shen <[email protected]>

Author: Vincent056

.golangci.yml

@@ -1,49 +1,35 @@
----
+version: "2"
 run:
+  concurrency: 6
   build-tags:
     - netgo
     - e2e
-  concurrency: 6
-  deadline: 5m
 linters:
-  disable-all: true
+  default: none
   enable:
     - asciicheck
     - bodyclose
-    - deadcode
-    - depguard
     - dogsled
     - dupl
+    - err113
     - errcheck
     - errorlint
     - exhaustive
-    - exportloopref
-    - gci
     - gochecknoinits
     - gocognit
     - goconst
     - gocritic
     - gocyclo
-    # TODO(jaosorior): Re-Add later
-    #- godot
     - godox
-    - goerr113
-    - gofmt
-    - gofumpt
     - goheader
-    - goimports
-    - golint
-    - gomnd
     - gomodguard
     - goprintffuncname
     - gosec
-    - gosimple
     - govet
     - ineffassign
-    - interfacer
     - lll
-    - maligned
     - misspell
+    - mnd
     - nakedret
     - nestif
     - noctx
@@ -52,101 +38,80 @@ linters:
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - structcheck
-    - stylecheck
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
     - wrapcheck
-    # - exhaustivestruct
-    # - funlen
-    # - gochecknoglobals
-    # - nlreturn
-    # - scopelint
-    # - testpackage
-    # - wsl
-linters-settings:
-  gci:
-    local-prefixes: containers/selinuxd
-  errcheck:
-    check-type-assertions: true
-    check-blank: true
-  godox:
-    keywords:
-      - BUG
-      - FIXME
-      - HACK
-  gocritic:
-    enabled-checks:
-      # Diagnostic
-      - appendAssign
-      - argOrder
-      - badCond
-      - caseOrder
-      - codegenComment
-      - commentedOutCode
-      - deprecatedComment
-      - dupArg
-      - dupBranchBody
-      - dupCase
-      - dupSubExpr
-      - exitAfterDefer
-      - flagDeref
-      - flagName
-      - nilValReturn
-      - offBy1
-      - sloppyReassign
-      - weakCond
-      - octalLiteral
-
-      # Performance
-      - appendCombine
-      - equalFold
-      - hugeParam
-      - indexAlloc
-      - rangeExprCopy
-      - rangeValCopy
-
-      # Style
-      - assignOp
-      - boolExprSimplify
-      - captLocal
-      - commentFormatting
-      - commentedOutImport
-      - defaultCaseOrder
-      - docStub
-      - elseif
-      - emptyFallthrough
-      - emptyStringTest
-      - hexLiteral
-      - ifElseChain
-      - methodExprCall
-      - regexpMust
-      - singleCaseSwitch
-      - sloppyLen
-      - stringXbytes
-      - switchTrue
-      - typeAssertChain
-      - typeSwitchVar
-      - underef
-      - unlabelStmt
-      - unlambda
-      - unslice
-      - valSwap
-      - wrapperFunc
-      - yodaStyleExpr
-
-      # Opinionated
-      - builtinShadow
-      - importShadow
-      - initClause
-      - nestingReduce
-      - paramTypeCombine
-      - ptrToRefParam
-      - typeUnparen
-      - unnamedResult
-      - unnecessaryBlock
+  settings:
+    errcheck:
+      check-type-assertions: true
+      check-blank: true
+    gocritic:
+      enabled-checks:
+        - commentedOutCode
+        - nilValReturn
+        - sloppyReassign
+        - weakCond
+        - octalLiteral
+        - appendCombine
+        - equalFold
+        - hugeParam
+        - indexAlloc
+        - rangeExprCopy
+        - rangeValCopy
+        - boolExprSimplify
+        - commentedOutImport
+        - docStub
+        - emptyFallthrough
+        - emptyStringTest
+        - hexLiteral
+        - methodExprCall
+        - stringXbytes
+        - typeAssertChain
+        - unlabelStmt
+        - yodaStyleExpr
+        - builtinShadow
+        - importShadow
+        - initClause
+        - nestingReduce
+        - paramTypeCombine
+        - ptrToRefParam
+        - typeUnparen
+        - unnamedResult
+        - unnecessaryBlock
+    godox:
+      keywords:
+        - BUG
+        - FIXME
+        - HACK
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - Standard
+        - Default
+        - Prefix(containers/selinuxd)
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

pkg/daemon/daemon_test.go

@@ -57,7 +57,6 @@ func getHTTPClient(sockpath string) *http.Client {
 	return &http.Client{
 		Transport: &http.Transport{
 			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
-				//nolint: wrapcheck // let's not complicate the test
 				return net.Dial("unix", sockpath)
 			},
 		},

pkg/datastore/bbolt.go

@@ -124,7 +124,6 @@ func (ds *bboltDataStore) List() ([]string, error) {
 		if root == nil {
 			return ErrDataStoreNotInitialized
 		}
-		//nolint:wrapcheck // this is a closure
 		return root.ForEach(func(k, v []byte) error {
 			output = append(output, string(k))
 			return nil
@@ -142,7 +141,6 @@ func (ds *bboltDataStore) Remove(policy string) error {
 		if root == nil {
 			return ErrDataStoreNotInitialized
 		}
-		//nolint:wrapcheck // this is a closure
 		return root.DeleteBucket([]byte(policy))
 	})
 	if err != nil {

tests/e2e/helpers.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	//nolint:golint,stylecheck
+	//nolint:staticcheck
 	. "github.com/onsi/ginkgo/v2"
-	//nolint:golint,stylecheck
+	//nolint:staticcheck
 	. "github.com/onsi/gomega"
 )