pkg+test: unify usage of policyv1alpha1 operators

Signed-off-by: Mohamed Awnallah <mohamedmohey2352@gmail.com>
karmada-io · Sep 9, 2024 · be87fd5
1 parent 32c2ef7
commit be87fd5
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 96 deletions.
diff --git a/pkg/controllers/namespace/namespace_sync_controller_test.go b/pkg/controllers/namespace/namespace_sync_controller_test.go
@@ -287,7 +287,7 @@ func TestController_buildWorks(t *testing.T) {
 						Plaintext: []policyv1alpha1.PlaintextOverrider{
 							{
 								Path:     "/metadata/labels/overridden",
-								Operator: "add",
+								Operator: policyv1alpha1.OverriderOpAdd,
 								Value: apiextensionsv1.JSON{
 									Raw: []byte(`"true"`),
 								},

diff --git a/pkg/util/overridemanager/commandargsoverride_test.go b/pkg/util/overridemanager/commandargsoverride_test.go
@@ -260,13 +260,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandDeploymentYaml(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "add",
+					Operator:      policyv1alpha1.OverriderOpAdd,
 					Value:         []string{"&& echo 'hello karmada'"},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/template/spec/containers/0/command",
 					Value: []string{"nginx", "-v", "-t", "&& echo 'hello karmada'"},
 				},
@@ -278,13 +278,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandDeploymentYaml(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "remove",
+					Operator:      policyv1alpha1.OverriderOpRemove,
 					Value:         []string{"-t"},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/template/spec/containers/0/command",
 					Value: []string{"nginx", "-v"},
 				},
@@ -296,13 +296,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandDeploymentYaml(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "remove",
+					Operator:      policyv1alpha1.OverriderOpRemove,
 					Value:         []string{},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/template/spec/containers/0/command",
 					Value: []string{"nginx", "-v", "-t"},
 				},
@@ -314,13 +314,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandDeploymentYamlWithTwoContainer(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "add",
+					Operator:      policyv1alpha1.OverriderOpAdd,
 					Value:         []string{"echo 'hello karmada'"},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/template/spec/containers/0/command",
 					Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"},
 				},
@@ -332,13 +332,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandDeploymentYamlWithTwoContainer(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "remove",
+					Operator:      policyv1alpha1.OverriderOpRemove,
 					Value:         []string{"-t"},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/template/spec/containers/0/command",
 					Value: []string{"nginx", "-v"},
 				},
@@ -350,13 +350,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandPodYaml(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "add",
+					Operator:      policyv1alpha1.OverriderOpAdd,
 					Value:         []string{"echo 'hello karmada'"},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/containers/0/command",
 					Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"},
 				},
@@ -368,13 +368,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandStatefulSetYaml(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "add",
+					Operator:      policyv1alpha1.OverriderOpAdd,
 					Value:         []string{"echo 'hello karmada'"},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/template/spec/containers/0/command",
 					Value: []string{"nginx", "-v", "-t", "echo 'hello karmada'"},
 				},
@@ -386,13 +386,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandReplicaSetYaml(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{
 					ContainerName: "nginx",
-					Operator:      "remove",
+					Operator:      policyv1alpha1.OverriderOpRemove,
 					Value:         []string{"-t"},
 				},
 			},
 			want: []overrideOption{
 				{
-					Op:    "replace",
+					Op:    string(policyv1alpha1.OverriderOpReplace),
 					Path:  "/spec/template/spec/containers/0/command",
 					Value: []string{"nginx", "-v"},
 				},
@@ -404,13 +404,13 @@ func TestParseJSONPatchesByCommandOverrider(t *testing.T) {
 				rawObj: generateTestCommandDaemonSetYaml(),
 				CommandArgsOverrider: &policyv1alpha1.CommandArgsOverrider{