Upgrade golang-ci from v1 to latest v2 (#2045)

camilamacedo86 · web-flow · commit 475e797c7405 · 2025-06-27T13:29:27.000Z
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -41,11 +41,11 @@ $(CRD_REF_DOCS): $(BINGO_DIR)/crd-ref-docs.mod
 	@echo "(re)installing $(GOBIN)/crd-ref-docs-v0.1.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-ref-docs.mod -o=$(GOBIN)/crd-ref-docs-v0.1.0 "github.com/elastic/crd-ref-docs"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.64.8
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.1.6
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.64.8"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.64.8 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v2.1.6"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.1.6 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
 
 GORELEASER := $(GOBIN)/goreleaser-v1.26.2
 $(GORELEASER): $(BINGO_DIR)/goreleaser.mod
diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod
@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.23.0
+go 1.24.2
 
-require github.com/golangci/golangci-lint v1.64.8 // cmd/golangci-lint
+toolchain go1.24.3
+
+require github.com/golangci/golangci-lint/v2 v2.1.6 // cmd/golangci-lint
diff --git a/.bingo/golangci-lint.sum b/.bingo/golangci-lint.sum
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -16,7 +16,7 @@ CRD_DIFF="${GOBIN}/crd-diff-v0.2.0"
 
 CRD_REF_DOCS="${GOBIN}/crd-ref-docs-v0.1.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.64.8"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.1.6"
 
 GORELEASER="${GOBIN}/goreleaser-v1.26.2"
 
diff --git a/.github/workflows/sanity.yaml b/.github/workflows/sanity.yaml
@@ -29,4 +29,4 @@ jobs:
           go-version-file: "go.mod"
 
       - name: Run golangci linting checks
-        run: make lint GOLANGCI_LINT_ARGS="--out-format colored-line-number"
+        run: make lint
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,75 +1,74 @@
-########
-# NOTE
-#
-#  This file is duplicated in the following repos:
-#    - operator-framework/kubectl-operator
-#    - operator-framework/catalogd
-#    - operator-framework/operator-controller
-#
-#  If you are making a change, please make it in ALL
-#  of the above repositories!
-#
-#  TODO: Find a way to have a shared golangci config.
-########
-
-run:
-  # Default timeout is 1m, up to give more room
-  timeout: 4m
-
-linters:
-  enable:
-  - asciicheck
-  - bodyclose
-  - errorlint
-  - gci
-  - gofmt
-  - govet
-  - gosec
-  - importas
-  - misspell
-  - nestif
-  - nonamedreturns
-  - prealloc
-  - stylecheck
-  - testifylint
-  - tparallel
-  - unconvert
-  - unparam
-  - unused
-  - whitespace
-
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - dot
-      - default
-      - prefix(github.com/operator-framework)
-      - localmodule
-    custom-order: true
-
-  errorlint:
-    errorf: false
-
-  importas:
-    alias:
-    - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
-      alias: metav1
-    - pkg: k8s.io/apimachinery/pkg/api/errors
-      alias: apierrors
-    - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
-      alias: apiextensionsv1
-    - pkg: k8s.io/apimachinery/pkg/util/runtime
-      alias: utilruntime
-    - pkg: "^k8s\\.io/api/([^/]+)/(v[^/]+)$"
-      alias: $1$2
-    - pkg: sigs.k8s.io/controller-runtime
-      alias: ctrl
-    - pkg: github.com/blang/semver/v4
-      alias: bsemver
-    - pkg: "^github.com/operator-framework/operator-controller/internal/util/([^/]+)$"
-      alias: "${1}util"
-
+version: "2"
 output:
   formats:
-    - format: tab
+    tab:
+      path: stdout
+      colors: false
+linters:
+  enable:
+    - asciicheck
+    - bodyclose
+    - errorlint
+    - gosec
+    - importas
+    - misspell
+    - nestif
+    - nonamedreturns
+    - prealloc
+    - staticcheck
+    - testifylint
+    - tparallel
+    - unconvert
+    - unparam
+    - whitespace
+  settings:
+    errorlint:
+      errorf: false
+    importas:
+      alias:
+        - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+          alias: metav1
+        - pkg: k8s.io/apimachinery/pkg/api/errors
+          alias: apierrors
+        - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
+          alias: apiextensionsv1
+        - pkg: k8s.io/apimachinery/pkg/util/runtime
+          alias: utilruntime
+        - pkg: ^k8s\.io/api/([^/]+)/(v[^/]+)$
+          alias: $1$2
+        - pkg: sigs.k8s.io/controller-runtime
+          alias: ctrl
+        - pkg: github.com/blang/semver/v4
+          alias: bsemver
+        - pkg: ^github.com/operator-framework/operator-controller/internal/util/([^/]+)$
+          alias: ${1}util
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+  settings:
+    gci:
+      sections:
+        - standard
+        - dot
+        - default
+        - prefix(github.com/operator-framework)
+        - localmodule
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/api/v1/clustercatalog_types_test.go b/api/v1/clustercatalog_types_test.go
@@ -149,7 +149,7 @@ func TestImageSourceCELValidationRules(t *testing.T) {
 			obj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&tc.spec) //nolint:gosec
 			require.NoError(t, err)
 			errs := validator(obj, nil)
-			require.Equal(t, len(tc.wantErrs), len(errs), "want", tc.wantErrs, "got", errs)
+			require.Len(t, errs, len(tc.wantErrs), "want", tc.wantErrs, "got", errs)
 			for i := range tc.wantErrs {
 				got := errs[i].Error()
 				assert.Equal(t, tc.wantErrs[i], got)
@@ -242,7 +242,7 @@ func TestResolvedImageSourceCELValidation(t *testing.T) {
 	} {
 		t.Run(name, func(t *testing.T) {
 			errs := validator(tc.spec.Ref, nil)
-			require.Equal(t, len(tc.wantErrs), len(errs), "want", tc.wantErrs, "got", errs)
+			require.Len(t, errs, len(tc.wantErrs), "want", tc.wantErrs, "got", errs)
 			for i := range tc.wantErrs {
 				got := errs[i].Error()
 				assert.Equal(t, tc.wantErrs[i], got)
@@ -286,7 +286,7 @@ func TestClusterCatalogURLsCELValidation(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			errs := validator(tc.urls.Base, nil)
 			fmt.Println(errs)
-			require.Equal(t, len(tc.wantErrs), len(errs))
+			require.Len(t, errs, len(tc.wantErrs))
 			for i := range tc.wantErrs {
 				got := errs[i].Error()
 				assert.Equal(t, tc.wantErrs[i], got)
@@ -327,7 +327,7 @@ func TestSourceCELValidation(t *testing.T) {
 			require.NoError(t, err)
 			errs := validator(obj, nil)
 			fmt.Println(errs)
-			require.Equal(t, len(tc.wantErrs), len(errs))
+			require.Len(t, errs, len(tc.wantErrs))
 			for i := range tc.wantErrs {
 				got := errs[i].Error()
 				assert.Equal(t, tc.wantErrs[i], got)
@@ -368,7 +368,7 @@ func TestResolvedSourceCELValidation(t *testing.T) {
 			obj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&tc.source) //nolint:gosec
 			require.NoError(t, err)
 			errs := validator(obj, nil)
-			require.Equal(t, len(tc.wantErrs), len(errs))
+			require.Len(t, errs, len(tc.wantErrs))
 			for i := range tc.wantErrs {
 				got := errs[i].Error()
 				assert.Equal(t, tc.wantErrs[i], got)
diff --git a/hack/tools/crd-generator/main.go b/hack/tools/crd-generator/main.go
@@ -120,12 +120,12 @@ func runGenerator(args ...string) {
 			crdRaw := parser.CustomResourceDefinitions[groupKind]
 
 			// Inline version of "addAttribution(&crdRaw)" ...
-			if crdRaw.ObjectMeta.Annotations == nil {
-				crdRaw.ObjectMeta.Annotations = map[string]string{}
+			if crdRaw.Annotations == nil {
+				crdRaw.Annotations = map[string]string{}
 			}
-			crdRaw.ObjectMeta.Annotations[FeatureSetAnnotation] = channel
+			crdRaw.Annotations[FeatureSetAnnotation] = channel
 			if ctVer != "" {
-				crdRaw.ObjectMeta.Annotations[VersionAnnotation] = ctVer
+				crdRaw.Annotations[VersionAnnotation] = ctVer
 			}
 
 			// Prevent the top level metadata for the CRD to be generated regardless of the intention in the arguments
diff --git a/internal/catalogd/controllers/core/clustercatalog_controller.go b/internal/catalogd/controllers/core/clustercatalog_controller.go
@@ -95,7 +95,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	defer l.Info("reconcile ending")
 
 	existingCatsrc := ocv1.ClusterCatalog{}
-	if err := r.Client.Get(ctx, req.NamespacedName, &existingCatsrc); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, &existingCatsrc); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
@@ -134,7 +134,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	reconciledCatsrc.Finalizers = finalizers
 
 	if updateFinalizers {
-		if err := r.Client.Update(ctx, reconciledCatsrc); err != nil {
+		if err := r.Update(ctx, reconciledCatsrc); err != nil {
 			reconcileErr = errors.Join(reconcileErr, fmt.Errorf("error updating finalizers: %v", err))
 		}
 	}
diff --git a/internal/catalogd/storage/localdir_test.go b/internal/catalogd/storage/localdir_test.go
@@ -401,7 +401,7 @@ func TestMetasEndpoint(t *testing.T) {
 			require.Equal(t, tc.expectedStatusCode, resp.StatusCode)
 			actualContent, err = io.ReadAll(resp.Body)
 			require.NoError(t, err)
-			require.Equal(t, "", string(actualContent)) // HEAD should not return a body
+			require.Empty(t, string(actualContent)) // HEAD should not return a body
 			resp.Body.Close()
 
 			// And make sure any other method is not allowed
diff --git a/internal/operator-controller/applier/helm_test.go b/internal/operator-controller/applier/helm_test.go
@@ -366,7 +366,7 @@ func TestApply_InstallationWithPreflightPermissionsEnabled(t *testing.T) {
 		objs, state, err := helmApplier.Apply(context.TODO(), validFS, validCE, testObjectLabels, testStorageLabels)
 		require.Error(t, err)
 		require.ErrorContains(t, err, "problem running preauthorization")
-		require.Equal(t, "", state)
+		require.Empty(t, state)
 		require.Nil(t, objs)
 	})
 
@@ -395,7 +395,7 @@ func TestApply_InstallationWithPreflightPermissionsEnabled(t *testing.T) {
 		objs, state, err := helmApplier.Apply(context.TODO(), validFS, validCE, testObjectLabels, testStorageLabels)
 		require.Error(t, err)
 		require.ErrorContains(t, err, errMissingRBAC)
-		require.Equal(t, "", state)
+		require.Empty(t, state)
 		require.Nil(t, objs)
 	})
 
diff --git a/internal/operator-controller/controllers/clustercatalog_controller.go b/internal/operator-controller/controllers/clustercatalog_controller.go
@@ -55,7 +55,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	defer l.Info("reconcile ending")
 
 	existingCatalog := &ocv1.ClusterCatalog{}
-	err := r.Client.Get(ctx, req.NamespacedName, existingCatalog)
+	err := r.Get(ctx, req.NamespacedName, existingCatalog)
 	if apierrors.IsNotFound(err) {
 		if err := r.CatalogCache.Remove(req.Name); err != nil {
 			return ctrl.Result{}, fmt.Errorf("error removing cache for catalog %q: %v", req.Name, err)
diff --git a/internal/operator-controller/controllers/clusterextension_controller.go b/internal/operator-controller/controllers/clusterextension_controller.go
@@ -111,7 +111,7 @@ func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	defer l.Info("reconcile ending")
 
 	existingExt := &ocv1.ClusterExtension{}
-	if err := r.Client.Get(ctx, req.NamespacedName, existingExt); err != nil {
+	if err := r.Get(ctx, req.NamespacedName, existingExt); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
@@ -141,7 +141,7 @@ func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	reconciledExt.Finalizers = finalizers
 
 	if updateFinalizers {
-		if err := r.Client.Update(ctx, reconciledExt); err != nil {
+		if err := r.Update(ctx, reconciledExt); err != nil {
 			reconcileErr = errors.Join(reconcileErr, fmt.Errorf("error updating finalizers: %v", err))
 		}
 	}
diff --git a/internal/operator-controller/controllers/clusterextension_controller_test.go b/internal/operator-controller/controllers/clusterextension_controller_test.go
@@ -1442,7 +1442,7 @@ func TestSetDeprecationStatus(t *testing.T) {
 			controllers.SetDeprecationStatus(tc.clusterExtension, tc.bundle.Name, tc.deprecation)
 			// TODO: we should test for unexpected changes to lastTransitionTime. We only expect
 			//  lastTransitionTime to change when the status of the condition changes.
-			assert.Equal(t, "", cmp.Diff(tc.expectedClusterExtension, tc.clusterExtension, cmpopts.IgnoreFields(metav1.Condition{}, "Message", "LastTransitionTime")))
+			assert.Empty(t, cmp.Diff(tc.expectedClusterExtension, tc.clusterExtension, cmpopts.IgnoreFields(metav1.Condition{}, "Message", "LastTransitionTime")))
 		})
 	}
 }
diff --git a/internal/operator-controller/resolve/catalog_test.go b/internal/operator-controller/resolve/catalog_test.go
@@ -618,7 +618,7 @@ func (w staticCatalogWalker) WalkCatalogs(ctx context.Context, _ string, f Catal
 		for _, opt := range opts {
 			opt.ApplyToList(&options)
 		}
-		if !options.LabelSelector.Matches(labels.Set(cat.ObjectMeta.Labels)) {
+		if !options.LabelSelector.Matches(labels.Set(cat.Labels)) {
 			continue
 		}
 		fbc, catCfg, fbcErr := v()
diff --git a/internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go b/internal/operator-controller/rukpak/preflights/crdupgradesafety/crdupgradesafety_test.go
@@ -199,7 +199,7 @@ func TestInstall(t *testing.T) {
 			err := preflight.Install(context.Background(), tc.release)
 			if len(tc.wantErrMsgs) != 0 {
 				for _, expectedErrMsg := range tc.wantErrMsgs {
-					require.ErrorContainsf(t, err, expectedErrMsg, "")
+					require.ErrorContains(t, err, expectedErrMsg)
 				}
 			} else {
 				require.NoError(t, err)
@@ -355,7 +355,7 @@ func TestUpgrade(t *testing.T) {
 			err := preflight.Upgrade(context.Background(), tc.release)
 			if len(tc.wantErrMsgs) != 0 {
 				for _, expectedErrMsg := range tc.wantErrMsgs {
-					require.ErrorContainsf(t, err, expectedErrMsg, "")
+					require.ErrorContains(t, err, expectedErrMsg)
 				}
 			} else {
 				require.NoError(t, err)
diff --git a/internal/operator-controller/rukpak/render/registryv1/generators/generators_test.go b/internal/operator-controller/rukpak/render/registryv1/generators/generators_test.go
@@ -728,7 +728,7 @@ func Test_BundleCSVPermissionsGenerator_Succeeds(t *testing.T) {
 			for i := range objs {
 				require.Equal(t, tc.expectedResources[i], objs[i], "failed to find expected resource at index %d", i)
 			}
-			require.Equal(t, len(tc.expectedResources), len(objs))
+			require.Len(t, objs, len(tc.expectedResources))
 		})
 	}
 }
@@ -1057,7 +1057,7 @@ func Test_BundleCSVClusterPermissionsGenerator_Succeeds(t *testing.T) {
 			for i := range objs {
 				require.Equal(t, tc.expectedResources[i], objs[i], "failed to find expected resource at index %d", i)
 			}
-			require.Equal(t, len(tc.expectedResources), len(objs))
+			require.Len(t, objs, len(tc.expectedResources))
 		})
 	}
 }
@@ -1209,7 +1209,7 @@ func Test_BundleCSVServiceAccountGenerator_Succeeds(t *testing.T) {
 			for i := range objs {
 				require.Equal(t, tc.expectedResources[i], objs[i], "failed to find expected resource at index %d", i)
 			}
-			require.Equal(t, len(tc.expectedResources), len(objs))
+			require.Len(t, objs, len(tc.expectedResources))
 		})
 	}
 }
diff --git a/internal/operator-controller/rukpak/render/registryv1/registryv1_test.go b/internal/operator-controller/rukpak/render/registryv1/registryv1_test.go
diff --git a/internal/operator-controller/rukpak/util/util_test.go b/internal/operator-controller/rukpak/util/util_test.go
diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go
diff --git a/test/e2e/network_policy_test.go b/test/e2e/network_policy_test.go
diff --git a/test/extension-developer-e2e/extension_developer_test.go b/test/extension-developer-e2e/extension_developer_test.go

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque`
`95`	`95`	`defer l.Info("reconcile ending")`
`96`	`96`
`97`	`97`	`existingCatsrc := ocv1.ClusterCatalog{}`
`98`		`- if err := r.Client.Get(ctx, req.NamespacedName, &existingCatsrc); err != nil {`
	`98`	`+ if err := r.Get(ctx, req.NamespacedName, &existingCatsrc); err != nil {`
`99`	`99`	`return ctrl.Result{}, client.IgnoreNotFound(err)`
`100`	`100`	`}`
`101`	`101`
`@@ -134,7 +134,7 @@ func (r *ClusterCatalogReconciler) Reconcile(ctx context.Context, req ctrl.Reque`
`134`	`134`	`reconciledCatsrc.Finalizers = finalizers`
`135`	`135`
`136`	`136`	`if updateFinalizers {`
`137`		`- if err := r.Client.Update(ctx, reconciledCatsrc); err != nil {`
	`137`	`+ if err := r.Update(ctx, reconciledCatsrc); err != nil {`
`138`	`138`	`reconcileErr = errors.Join(reconcileErr, fmt.Errorf("error updating finalizers: %v", err))`
`139`	`139`	`}`
`140`	`140`	`}`