Fix: open list lit for fill value (#87)

Signed-off-by: FogDong <[email protected]> Signed-off-by: FogDong <[email protected]>
kubevela · Jan 3, 2023 · dd7a3c0 · dd7a3c0
1 parent 6b7697b
commit dd7a3c0
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/pkg/cue/model/sets/operation.go b/pkg/cue/model/sets/operation.go
@@ -281,7 +281,7 @@ func strategyUnify(base cue.Value, patch cue.Value, params *UnifyParams, patchOp
 	} else if params.PatchStrategy == StrategyJSONPatch {
 		return jsonPatch(base, patch.LookupPath(cue.ParsePath("operations")))
 	}
-	openBase, err := openListLit(base)
+	openBase, err := OpenListLit(base)
 	if err != nil {
 		return cue.Value{}, errors.Wrapf(err, "failed to open list it for merge")
 	}

diff --git a/pkg/cue/model/sets/utils.go b/pkg/cue/model/sets/utils.go
@@ -311,8 +311,9 @@ func OpenBaiscLit(val cue.Value) (*ast.File, error) {
 	return f, err
 }
 
+// OpenListLit make that the listLit can be modified.
 // nolint:staticcheck
-func openListLit(val cue.Value) (*ast.File, error) {
+func OpenListLit(val cue.Value) (*ast.File, error) {
 	f, err := ToFile(val.Syntax(cue.Docs(true), cue.ResolveReferences(true)))
 	if err != nil {
 		return nil, err

diff --git a/pkg/cue/model/value/value.go b/pkg/cue/model/value/value.go
@@ -290,7 +290,12 @@ func (val *Value) FillRaw(x string, paths ...string) error {
 
 // FillValueByScript unify the value x at the given script path.
 func (val *Value) FillValueByScript(x *Value, path string) error {
-	newV := val.v.FillPath(FieldPath(path), x.v)
+	f, err := sets.OpenListLit(val.v)
+	if err != nil {
+		return err
+	}
+	v := val.r.BuildFile(f)
+	newV := v.FillPath(FieldPath(path), x.v)
 	if err := newV.Err(); err != nil {
 		return err
 	}

diff --git a/pkg/cue/model/value/value_test.go b/pkg/cue/model/value/value_test.go
@@ -942,6 +942,13 @@ func TestFillByScript(t *testing.T) {
 		v        string
 		expected string
 	}{
+		{
+			name: "insert array",
+			raw:  `a: ["hello"]`,
+			path: "a[1]",
+			v:    `"world"`,
+			expected: `a: ["hello", "world", ...]
+`},
 		{
 			name: "insert array",
 			raw:  `a: b: [{x: 100},...]`,
@@ -970,7 +977,7 @@ a: b: c: [{x: 100}, {x: 101}, {x: 102}]`,
 			x: 101
 		}, {
 			x: 102
-		}]
+		}, ...]
 	}
 }
 `,
@@ -986,9 +993,9 @@ a: b: c: [{x: 100}, {x: 101}, {x: 102}]`,
 			y: [{
 				name:  "key"
 				value: "foo"
-			}]
+			}, ...]
 		}
-	}]
+	}, ...]
 }
 `,
 		},
@@ -1002,9 +1009,9 @@ a: b: c: [{x: 100}, {x: 101}, {x: 102}]`,
 		x: {
 			y: [{
 				name: "key"
-			}]
+			}, ...]
 		}
-	}]
+	}, ...]
 	c: {
 		x: "foo"
 	}
@@ -1021,9 +1028,9 @@ a: b: c: [{x: 100}, {x: 101}, {x: 102}]`,
 		x: {
 			y: [{
 				name: "key"
-			}]
+			}, ...]
 		}
-	}]
+	}, ...]
 	c: {
 		x: "foo"
 	}
@@ -1073,13 +1080,6 @@ a: b: c: [{x: 100}, {x: 101}, {x: 102}]`,
 			v:    `"foo"`,
 			err:  "a.b.0.x.y.0.name: conflicting values \"foo\" and \"key\"",
 		},
-		{
-			name: "filled value with incompatible list lengths",
-			raw:  `a: b: [{x: y:[{name: "key"}]}]`,
-			path: "a.b[3].x.y[0].value",
-			v:    `"foo"`,
-			err:  "a.b: incompatible list lengths (1 and 5)",
-		},
 	}
 
 	for _, errCase := range errCases {