fix lint issues faced after the upgrade

camilamacedo86 · camilamacedo86 · commit 38358377584e · 2025-06-24T20:40:41.000+01:00
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
@@ -34,7 +34,7 @@ func Test_BundleValidatorHasAllValidationFns(t *testing.T) {
 	}
 	actualValidationFns := registryv1.BundleValidator
 
-	require.Equal(t, len(expectedValidationFns), len(actualValidationFns))
+	require.Len(t, actualValidationFns, len(expectedValidationFns))
 	for i := range expectedValidationFns {
 		require.Equal(t, reflect.ValueOf(expectedValidationFns[i]).Pointer(), reflect.ValueOf(actualValidationFns[i]).Pointer(), "bundle validator has unexpected validation function")
 	}
@@ -55,7 +55,7 @@ func Test_ResourceGeneratorsHasAllGenerators(t *testing.T) {
 	}
 	actualGenerators := registryv1.ResourceGenerators
 
-	require.Equal(t, len(expectedGenerators), len(actualGenerators))
+	require.Len(t, actualGenerators, len(expectedGenerators))
 	for i := range expectedGenerators {
 		require.Equal(t, reflect.ValueOf(expectedGenerators[i]).Pointer(), reflect.ValueOf(actualGenerators[i]).Pointer(), "bundle validator has unexpected validation function")
 	}
diff --git a/internal/operator-controller/rukpak/util/util_test.go b/internal/operator-controller/rukpak/util/util_test.go
@@ -127,7 +127,7 @@ spec:
 			if tc.wantErr {
 				require.Error(t, err)
 			} else {
-				assert.Equal(t, len(objs), len(tc.expectObjects))
+				assert.Len(t, tc.expectObjects, len(objs))
 				// Sort the objs by name for easy direct comparison
 				sort.Slice(objs, func(i int, j int) bool {
 					return objs[i].GetName() < objs[j].GetName()
diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go
@@ -228,9 +228,9 @@ func validateCatalogUnpack(t *testing.T) {
 	}, pollDuration, pollInterval)
 
 	t.Log("Checking that catalog has the expected metadata label")
-	assert.NotNil(t, catalog.ObjectMeta.Labels)
-	assert.Contains(t, catalog.ObjectMeta.Labels, "olm.operatorframework.io/metadata.name")
-	assert.Equal(t, testCatalogName, catalog.ObjectMeta.Labels["olm.operatorframework.io/metadata.name"])
+	assert.NotNil(t, catalog.Labels)
+	assert.Contains(t, catalog.Labels, "olm.operatorframework.io/metadata.name")
+	assert.Equal(t, testCatalogName, catalog.Labels["olm.operatorframework.io/metadata.name"])
 
 	t.Log("Ensuring ClusterCatalog has Status.Condition of Type = Serving with status == True")
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
diff --git a/test/e2e/network_policy_test.go b/test/e2e/network_policy_test.go
@@ -251,7 +251,7 @@ func TestNetworkPolicyJustifications(t *testing.T) {
 	}
 
 	// 5. Ensure all policies in the registry were found in the cluster
-	assert.Equal(t, len(allowedNetworkPolicies), len(validatedRegistryPolicies),
+	assert.Len(t, validatedRegistryPolicies, len(allowedNetworkPolicies),
 		"Mismatch between number of expected policies in registry (%d) and number of policies found & validated in cluster (%d). Missing policies from registry: %v", len(allowedNetworkPolicies), len(validatedRegistryPolicies), missingPolicies(allowedNetworkPolicies, validatedRegistryPolicies))
 }
 
diff --git a/test/extension-developer-e2e/extension_developer_test.go b/test/extension-developer-e2e/extension_developer_test.go
@@ -195,7 +195,7 @@ func TestExtensionDeveloper(t *testing.T) {
 	}
 	require.NoError(t, c.Create(ctx, crb))
 
-	t.Logf("When creating an ClusterExtension that references a package with a %q bundle type", clusterExtension.ObjectMeta.Name)
+	t.Logf("When creating an ClusterExtension that references a package with a %q bundle type", clusterExtension.Name)
 	require.NoError(t, c.Create(context.Background(), clusterExtension))
 	t.Log("It should have a status condition type of Installed with a status of True and a reason of Success")
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {

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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`111`	`111`	`defer l.Info("reconcile ending")`
`112`	`112`
`113`	`113`	`existingExt := &ocv1.ClusterExtension{}`
`114`		`- if err := r.Client.Get(ctx, req.NamespacedName, existingExt); err != nil {`
	`114`	`+ if err := r.Get(ctx, req.NamespacedName, existingExt); err != nil {`
`115`	`115`	`return ctrl.Result{}, client.IgnoreNotFound(err)`
`116`	`116`	`}`
`117`	`117`
`@@ -141,7 +141,7 @@ func (r *ClusterExtensionReconciler) Reconcile(ctx context.Context, req ctrl.Req`
`141`	`141`	`reconciledExt.Finalizers = finalizers`
`142`	`142`
`143`	`143`	`if updateFinalizers {`
`144`		`- if err := r.Client.Update(ctx, reconciledExt); err != nil {`
	`144`	`+ if err := r.Update(ctx, reconciledExt); err != nil {`
`145`	`145`	`reconcileErr = errors.Join(reconcileErr, fmt.Errorf("error updating finalizers: %v", err))`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1442,7 +1442,7 @@ func TestSetDeprecationStatus(t *testing.T) {`
`1442`	`1442`	`controllers.SetDeprecationStatus(tc.clusterExtension, tc.bundle.Name, tc.deprecation)`
`1443`	`1443`	`// TODO: we should test for unexpected changes to lastTransitionTime. We only expect`
`1444`	`1444`	`// lastTransitionTime to change when the status of the condition changes.`
`1445`		`- assert.Equal(t, "", cmp.Diff(tc.expectedClusterExtension, tc.clusterExtension, cmpopts.IgnoreFields(metav1.Condition{}, "Message", "LastTransitionTime")))`
	`1445`	`+ assert.Empty(t, cmp.Diff(tc.expectedClusterExtension, tc.clusterExtension, cmpopts.IgnoreFields(metav1.Condition{}, "Message", "LastTransitionTime")))`
`1446`	`1446`	`})`
`1447`	`1447`	`}`
`1448`	`1448`	`}`
Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,7 @@ func (w staticCatalogWalker) WalkCatalogs(ctx context.Context, _ string, f Catal`
`618`	`618`	`for _, opt := range opts {`
`619`	`619`	`opt.ApplyToList(&options)`
`620`	`620`	`}`
`621`		`- if !options.LabelSelector.Matches(labels.Set(cat.ObjectMeta.Labels)) {`
	`621`	`+ if !options.LabelSelector.Matches(labels.Set(cat.Labels)) {`
`622`	`622`	`continue`
`623`	`623`	`}`
`624`	`624`	`fbc, catCfg, fbcErr := v()`