Merge pull request #1340 from JoelSpeed/update-golangci-lint

NO-ISSUE: Update fake clientsets to NewClientset

Author: openshift-merge-bot[bot]

lib/resourceapply/security_test.go

@@ -154,7 +154,7 @@ func TestApplySecurityContextConstraintsv1(t *testing.T) {
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			newClient := securityfake.NewSimpleClientset()
+			newClient := securityfake.NewClientset()
 			// We cannot simply initialize the client because initialization is broken for SCC
 			// https://github.com/openshift/client-go/issues/244
 			if tc.existing != nil {
@@ -176,16 +176,46 @@ func TestApplySecurityContextConstraintsv1(t *testing.T) {
 				t.Fatalf("expected no error, got %v", err)
 			}
 
-			if diff := cmp.Diff(tc.expectedAPICalls, newClient.Actions()); diff != "" {
+			if diff := cmp.Diff(tc.expectedAPICalls, clearManagedFields(newClient.Actions())); diff != "" {
 				t.Errorf("API calls differ from expected:\n%s", diff)
 			}
 
 			if tc.expectedModified != modified {
 				t.Errorf("expected modified %v, got %v", tc.expectedModified, modified)
 			}
+
+			if actual != nil {
+				// The client sets managed fields, but we don't want to test that
+				// so clear them here as they aren't present in the `expected` SCC.
+				actual.ManagedFields = nil
+			}
+
 			if diff := cmp.Diff(tc.expected(), actual); diff != "" {
 				t.Errorf("SCC differs from expected:\n%s", diff)
 			}
 		})
 	}
 }
+
+// clearManagedFields clears the managed fields from the update actions
+// as they aren't present in the `expected` actions.
+// We don't want to test that this metadata is set by the client.
+func clearManagedFields(actions []kubetesting.Action) []kubetesting.Action {
+	for i := range actions {
+		updateAction, ok := actions[i].(kubetesting.UpdateActionImpl)
+		if !ok {
+			continue
+		}
+
+		metaObj, ok := updateAction.Object.(metav1.Object)
+		if !ok {
+			continue
+		}
+
+		metaObj.SetManagedFields(nil)
+
+		actions[i] = updateAction
+	}
+
+	return actions
+}

pkg/cvo/cvo_test.go

@@ -503,7 +503,7 @@ func TestOperator_sync(t *testing.T) {
 				},
 				namespace: "test",
 				name:      "default",
-				client: fake.NewSimpleClientset(
+				client: fake.NewClientset(
 					&configv1.ClusterVersion{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "default",
@@ -560,7 +560,7 @@ func TestOperator_sync(t *testing.T) {
 				},
 				namespace: "test",
 				name:      "default",
-				client: fake.NewSimpleClientset(
+				client: fake.NewClientset(
 					&configv1.ClusterVersion{
 						ObjectMeta: metav1.ObjectMeta{
 							Name: "default",
@@ -4224,7 +4224,7 @@ func Test_loadReleaseVerifierFromConfigMap(t *testing.T) {
 			tt.update.Manifests = ms
 		}
 		t.Run(tt.name, func(t *testing.T) {
-			f := kfake.NewSimpleClientset()
+			f := kfake.NewClientset()
 			got, store, err := loadConfigMapVerifierDataFromUpdate(tt.update, sigstore.DefaultClient, f.CoreV1(), &serial.Store{})
 			if err == nil {
 				if tt.expectedError != "" {

pkg/featuregates/featurechangestopper_test.go

@@ -99,7 +99,7 @@ func TestTechPreviewChangeStopper(t *testing.T) {
 				tt.startingCvoFeatureGates = CvoGates{unknownVersion: true}
 			}
 
-			client := fakeconfigv1client.NewSimpleClientset(fg)
+			client := fakeconfigv1client.NewClientset(fg)
 
 			informerFactory := configv1informer.NewSharedInformerFactory(client, 0)
 			c, err := NewChangeStopper(informerFactory.Config().V1().FeatureGates(), tt.startingRequiredFeatureSet, tt.startingCvoFeatureGates)