fix: failed keeping required if object has required properties

Signed-off-by: thxCode <thxcode0824@gmail.com>

Author: thxCode

pkg/resourcedefinitions/helper.go

@@ -570,7 +570,11 @@ func refillVariableSchemaRef(
 				return
 			}
 
-			v.AdditionalProperties.Schema.Value.Default = def
+			// Refill the default value to the additional properties,
+			// but ignore this refilling when it is an array item.
+			if !strings.HasSuffix(key, ".0") {
+				v.Default = def
+			}
 
 			// Turn property to optional if found different defaults.
 			pName := pNames[len(pNames)-1]
@@ -694,14 +698,14 @@ func alignDefaults(key string, defs [][]byte) (any, bool) {
 		var found bool
 
 		for _, d := range defs {
-			jq := json.Get(d, prefix)
+			jq := json.Get(d, key)
 			if jq.Exists() {
 				found = true
 				break
 			}
 		}
 
-		// Return directly if parent is not found.
+		// Return directly if key is not found.
 		if !found {
 			return nil, false
 		}

pkg/resourcedefinitions/testdata/refill_variable_schema_ref/optional/default.1.json

@@ -23,11 +23,15 @@
     "publicly_accessible": true
   },
   "operation_labels": {
-    "key1": "value1"
+    "key1": "value1",
+    "key2": "value2"
   },
   "operation_pool_labels": [
     {
       "key1": "value1"
+    },
+    {
+      "key2": "value2"
     }
   ]
 }

pkg/resourcedefinitions/testdata/refill_variable_schema_ref/optional/default.2.json

@@ -29,6 +29,9 @@
   "operation_pool_labels": [
     {
       "key1": "value1"
+    },
+    {
+      "key2": "value2"
     }
   ]
 }

pkg/resourcedefinitions/testdata/refill_variable_schema_ref/optional/expected.yaml

@@ -102,6 +102,8 @@ components:
             colSpan: 12
     variables:
       type: object
+      required:
+        - infrastructure
       properties:
         context:
           type: object
@@ -205,6 +207,8 @@ components:
         infrastructure:
           type: object
           title: Infrastructure
+          required:
+            - kms_key_id
           properties:
             vpc_id:
               type: string
@@ -272,17 +276,19 @@ components:
             order: 4
             showIf: architecture=replication
         operation_labels:
+          default:
+            key1: "value1"
+            key2: "value2"
           additionalProperties:
-            type: object
+            type: string
           title: Operation Labels
           type: object
         operation_pool_labels:
           default:
             - key1: "value1"
+            - key2: "value2"
           items:
             additionalProperties:
-              default:
-                key1: "value1"
               type: string
             type: object
           title: Operation Pool Labels

pkg/resourcedefinitions/testdata/refill_variable_schema_ref/optional/given.yaml

@@ -212,8 +212,10 @@ components:
         infrastructure:
           type: object
           title: Infrastructure
+          # NB: we will tidy up this field.
           required:
             - vpc_id
+            - kms_key_id
           properties:
             # NB: we mark this property optional as the given defaults are not the same.
             vpc_id:
@@ -284,8 +286,10 @@ components:
             order: 4
             showIf: architecture=replication
         operation_labels:
+          default:
+            name: default-node
           additionalProperties:
-            type: object
+            type: string
           title: Operation Labels
           type: object
         operation_pool_labels: