update

Signed-off-by: Patrick <[email protected]>
karmada-io · Aug 13, 2024 · 0b8c695 · 0b8c695
1 parent d119c17
commit 0b8c695
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 25 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -18867,7 +18867,7 @@
       }
     },
     "com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.Overriders": {
-      "description": "Overriders offers various alternatives to represent the override rules.\n\nIf more than one alternative exists, they will be applied with following order: - ImageOverrider - CommandOverrider - ArgsOverrider - LabelsOverrider - AnnotationsOverrider - Plaintext",
+      "description": "Overriders offers various alternatives to represent the override rules.\n\nIf more than one alternative exists, they will be applied with following order: - ImageOverrider - CommandOverrider - ArgsOverrider - LabelsOverrider - AnnotationsOverrider - Plaintext - PlaintextObjectOverrider",
       "type": "object",
       "properties": {
         "annotationsOverrider": {
@@ -18917,6 +18917,14 @@
             "default": {},
             "$ref": "#/definitions/com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextOverrider"
           }
+        },
+        "plaintextObjectOverrider": {
+          "description": "PlaintextObjectOverrider represents the rules dedicated to handling yaml or json object overrides",
+          "type": "array",
+          "items": {
+            "default": {},
+            "$ref": "#/definitions/com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextObjectOverrider"
+          }
         }
       }
     },
@@ -18958,6 +18966,29 @@
         }
       }
     },
+    "com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextObjectOverrider": {
+      "description": "PlaintextObjectOverrider represents the rules dedicated to handling yaml or json object overrides",
+      "type": "object",
+      "required": [
+        "path",
+        "plaintext"
+      ],
+      "properties": {
+        "path": {
+          "description": "Path indicates the path of target field",
+          "type": "string",
+          "default": ""
+        },
+        "plaintext": {
+          "description": "Plaintext represents override rules defined with plaintext overriders.",
+          "type": "array",
+          "items": {
+            "default": {},
+            "$ref": "#/definitions/com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextOverrider"
+          }
+        }
+      }
+    },
     "com.github.karmada-io.karmada.pkg.apis.policy.v1alpha1.PlaintextOverrider": {
       "description": "PlaintextOverrider is a simple overrider that overrides target fields according to path, operator and value.",
       "type": "object",

diff --git a/pkg/apis/policy/v1alpha1/override_types.go b/pkg/apis/policy/v1alpha1/override_types.go
@@ -102,7 +102,7 @@ type RuleWithCluster struct {
 // - LabelsOverrider
 // - AnnotationsOverrider
 // - Plaintext
-// - PlaintextObjectOverrider 
+// - PlaintextObjectOverrider
 type Overriders struct {
 	// Plaintext represents override rules defined with plaintext overriders.
 	// +optional

diff --git a/pkg/util/overridemanager/overridemanager_test.go b/pkg/util/overridemanager/overridemanager_test.go
@@ -492,9 +492,9 @@ key:
 												Path: "data.test\\.yaml",
 												Plaintext: []policyv1alpha1.PlaintextOverrider{
 													{
-														Path: "/key/key1",
+														Path:     "/key/key1",
 														Operator: policyv1alpha1.OverriderOpReplace,
-											    	Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
+														Value:    apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
 													},
 												},
 											},
@@ -518,20 +518,20 @@ key:
 						PolicyName: "test1",
 						Overriders: policyv1alpha1.Overriders{
 							PlaintextObjectOverrider: []policyv1alpha1.PlaintextObjectOverrider{
-							{
-								Path: "data.test\\.yaml",
-								Plaintext: []policyv1alpha1.PlaintextOverrider{
-									{
-										Path: "/key/key1",
-										Operator: policyv1alpha1.OverriderOpReplace,
-										Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
+								{
+									Path: "data.test\\.yaml",
+									Plaintext: []policyv1alpha1.PlaintextOverrider{
+										{
+											Path:     "/key/key1",
+											Operator: policyv1alpha1.OverriderOpReplace,
+											Value:    apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
+										},
 									},
 								},
 							},
 						},
 					},
 				},
-			 },
 			},
 			wantErr: false,
 		},
@@ -565,7 +565,6 @@ key:
 	}
 }
 
-
 func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
 	configmap := helper.NewConfigMap(metav1.NamespaceDefault, "test1", map[string]string{
 		"test.yaml": `{"key":{"key1":"value"}`,
@@ -612,9 +611,9 @@ func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
 												Path: "data.test\\.yaml",
 												Plaintext: []policyv1alpha1.PlaintextOverrider{
 													{
-														Path: "/key/key1",
+														Path:     "/key/key1",
 														Operator: policyv1alpha1.OverriderOpReplace,
-											    	Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
+														Value:    apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
 													},
 												},
 											},
@@ -638,20 +637,20 @@ func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
 						PolicyName: "test1",
 						Overriders: policyv1alpha1.Overriders{
 							PlaintextObjectOverrider: []policyv1alpha1.PlaintextObjectOverrider{
-							{
-								Path: "data.test\\.yaml",
-								Plaintext: []policyv1alpha1.PlaintextOverrider{
-									{
-										Path: "/key/key1",
-										Operator: policyv1alpha1.OverriderOpReplace,
-										Value: apiextensionsv1.JSON{Raw:[]byte(`"updated_value"`)},
+								{
+									Path: "data.test\\.yaml",
+									Plaintext: []policyv1alpha1.PlaintextOverrider{
+										{
+											Path:     "/key/key1",
+											Operator: policyv1alpha1.OverriderOpReplace,
+											Value:    apiextensionsv1.JSON{Raw: []byte(`"updated_value"`)},
+										},
 									},
 								},
 							},
 						},
 					},
 				},
-			 },
 			},
 			wantErr: false,
 		},
@@ -682,5 +681,3 @@ func Test_overrideManagerImpl_ApplyJSONOverridePolicies(t *testing.T) {
 		})
 	}
 }
-
-