Switch to golangci-lint v2

Signed-off-by: Sascha Grunert <[email protected]>

Author: saschagrunert

.golangci.yml

@@ -1,15 +1,9 @@
 ---
+version: "2"
 run:
   concurrency: 6
-  timeout: 10m
-issues:
-  exclude-rules:
-    - path: internal/pkg/daemon/bpfrecorder/generated.go
-      linters:
-        - gofumpt
-        - lll
 linters:
-  disable-all: true
+  default: none
   enable:
     - asasalint
     - asciicheck
@@ -32,7 +26,6 @@ linters:
     - exptostd
     - fatcontext
     - forcetypeassert
-    - gci
     - ginkgolinter
     - gocheckcompilerdirectives
     - gochecknoinits
@@ -43,14 +36,10 @@ linters:
     - gocyclo
     - godot
     - godox
-    - gofmt
-    - gofumpt
     - goheader
-    - goimports
     - gomodguard
     - goprintffuncname
     - gosec
-    - gosimple
     - gosmopolitan
     - govet
     - grouper
@@ -87,14 +76,12 @@ linters:
     - spancheck
     - sqlclosecheck
     - staticcheck
-    - stylecheck
     - tagalign
     - tagliatelle
     - testableexamples
     - testifylint
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - unused
@@ -121,35 +108,64 @@ linters:
     # - testpackage
     # - varnamelen
     # - wrapcheck
-linters-settings:
-  revive:
+  settings:
+    errcheck:
+      check-type-assertions: true
+      check-blank: true
+    gocognit:
+      min-complexity: 40
+    goconst:
+      min-occurrences: 6
+    gocritic:
+      enable-all: true
+    godox:
+      keywords:
+        - BUG
+        - FIXME
+        - HACK
+    gomoddirectives:
+      replace-allow-list:
+        - golang.org/x/sys
+    gosec:
+      excludes:
+        - G115
+    nestif:
+      min-complexity: 15
+    revive:
+      rules:
+        - name: unused-parameter
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: unused-parameter
-        disabled: true
-  goconst:
-    min-occurrences: 6
-  gomoddirectives:
-    replace-allow-list:
-      - golang.org/x/sys
-  gocognit:
-    min-complexity: 40
-  gosec:
-    excludes:
-      - G115  # Potential integer overflow when converting between types
-  nestif:
-    min-complexity: 15
-  gci:
-    sections:
-      - standard
-      - default
-      - localmodule
-  errcheck:
-    check-type-assertions: true
-    check-blank: true
-  godox:
-    keywords:
-      - BUG
-      - FIXME
-      - HACK
-  gocritic:
-    enable-all: true
+      - linters:
+          - lll
+        path: internal/pkg/daemon/bpfrecorder/generated.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - localmodule
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+      - internal/pkg/daemon/bpfrecorder/generated.go

Makefile

@@ -14,7 +14,7 @@
 
 GO ?= go
 
-GOLANGCI_LINT_VERSION = v1.64.5
+GOLANGCI_LINT_VERSION = v2.0.1
 REPO_INFRA_VERSION = v0.2.5
 KUSTOMIZE_VERSION = 5.5.0
 OPERATOR_SDK_VERSION ?= v1.37.0

api/profilebase/v1alpha1/profilebase.go

@@ -52,7 +52,7 @@ func IsDisabled(prfSpec *SpecBase) bool {
 }
 
 func IsReconcilable(prfBase SecurityProfileBase) bool {
-	return !(prfBase.IsDisabled() || prfBase.IsPartial())
+	return !prfBase.IsDisabled() && !prfBase.IsPartial()
 }
 
 func ListProfilesByRecording(

api/spod/v1alpha1/spod_types.go

@@ -382,22 +382,22 @@ type SecurityProfilesOperatorDaemonList struct {
 
 func (s *SPODStatus) StatePending() {
 	s.State = SPODStatePending
-	s.ConditionedStatus.SetConditions(Pending())
+	s.SetConditions(Pending())
 }
 
 func (s *SPODStatus) StateCreating() {
 	s.State = SPODStateCreating
-	s.ConditionedStatus.SetConditions(Creating())
+	s.SetConditions(Creating())
 }
 
 func (s *SPODStatus) StateUpdating() {
 	s.State = SPODStateUpdating
-	s.ConditionedStatus.SetConditions(Updating())
+	s.SetConditions(Updating())
 }
 
 func (s *SPODStatus) StateRunning() {
 	s.State = SPODStateRunning
-	s.ConditionedStatus.SetConditions(Available())
+	s.SetConditions(Available())
 }
 
 func init() { //nolint:gochecknoinits // required to init the scheme

dependencies.yaml

@@ -1,6 +1,6 @@
 dependencies:
   - name: golangci-lint
-    version: 1.64.5
+    version: 2.0.1
     refPaths:
     - path: Makefile
       match: GOLANGCI_LINT_VERSION

internal/pkg/cli/installer/options_test.go

@@ -47,7 +47,7 @@ func TestFromContext(t *testing.T) {
 			},
 			assert: func(options *Options, err error) {
 				require.NoError(t, err)
-				require.Equal(t, "", options.ExecutablePath)
+				require.Empty(t, options.ExecutablePath)
 				require.Equal(t, "profile.yml", options.ProfilePath)
 			},
 		},
@@ -57,7 +57,7 @@ func TestFromContext(t *testing.T) {
 			},
 			assert: func(options *Options, err error) {
 				require.NoError(t, err)
-				require.Equal(t, "", options.ExecutablePath)
+				require.Empty(t, options.ExecutablePath)
 				require.Equal(t, DefaultProfileFile, options.ProfilePath)
 			},
 		},

internal/pkg/cli/platform.go

@@ -40,11 +40,11 @@ func ParsePlatform(input string) (*v1.Platform, error) {
 	parts := strings.Split(platformStr, "/")
 
 	switch len(parts) {
-	case 3: //nolint:gomnd // intentional
+	case 3:
 		res.Variant = parts[2]
 
 		fallthrough
-	case 2: //nolint:gomnd // intentional
+	case 2:
 		res.Architecture = parts[1]
 	case 1:
 		res.Architecture = runtime.GOARCH

internal/pkg/daemon/bpfrecorder/generate/main.go

@@ -89,7 +89,6 @@ func run() error {
 
 	//nolint:gosec // permissions are fine
 	if err := os.WriteFile(
-		//nolint:gomnd // filemode is fine
 		generatedGo, []byte(builder.String()), 0o644,
 	); err != nil {
 		return fmt.Errorf("writing generated object: %w", err)
@@ -168,11 +167,11 @@ func generateBtf(builder *strings.Builder) error {
 		}
 		if _, ok := btfs[os][osVersion][arch]; !ok {
 			btfs[os][osVersion][arch] = map[types.Kernel][]byte{}
-			fmt.Fprintf(docs, "%s- %s\n", strings.Repeat(" ", 4), arch) //nolint:gomnd // indent
+			fmt.Fprintf(docs, "%s- %s\n", strings.Repeat(" ", 4), arch)
 		}
 
 		btfs[os][osVersion][arch][kernel] = btfBytes
-		fmt.Fprintf(docs, "%s- %s\n", strings.Repeat(" ", 6), kernel) //nolint:gomnd // indent
+		fmt.Fprintf(docs, "%s- %s\n", strings.Repeat(" ", 6), kernel)
 		kernels++
 
 		return nil
@@ -191,7 +190,7 @@ func generateBtf(builder *strings.Builder) error {
 	fmt.Fprintf(docs, "\nSum: %d\n", kernels)
 
 	if err := os.WriteFile(
-		docsFile, docs.Bytes(), fs.FileMode(0o644), //nolint:gomnd // filemode is fine
+		docsFile, docs.Bytes(), fs.FileMode(0o644),
 	); err != nil {
 		return fmt.Errorf("write docs file: %w", err)
 	}

internal/pkg/daemon/profilerecorder/profilerecorder.go

@@ -242,7 +242,7 @@ func (r *RecorderReconciler) Reconcile(ctx context.Context, req reconcile.Reques
 	}
 
 	if pod.Status.Phase == corev1.PodPending {
-		if _, ok := r.podsToWatch.Load(req.NamespacedName.String()); ok {
+		if _, ok := r.podsToWatch.Load(req.String()); ok {
 			// We're tracking this pod already
 			return reconcile.Result{}, nil
 		}
@@ -292,7 +292,7 @@ func (r *RecorderReconciler) Reconcile(ctx context.Context, req reconcile.Reques
 		}
 
 		for _, prf := range profiles {
-			logger.Info("Recording profile", "kind", prf.kind, "name", prf.name, "pod", req.NamespacedName.String())
+			logger.Info("Recording profile", "kind", prf.kind, "name", prf.name, "pod", req.String())
 		}
 
 		// for pods managed by a replicated controller, let's store the replicated
@@ -303,7 +303,7 @@ func (r *RecorderReconciler) Reconcile(ctx context.Context, req reconcile.Reques
 		}
 
 		r.podsToWatch.Store(
-			req.NamespacedName.String(),
+			req.String(),
 			podToWatch{baseName, recorder, profiles},
 		)
 		r.record.Event(pod, util.EventTypeNormal, reasonProfileRecording, "Recording profiles")