feat: Treat -a values as yaml

kluctl · Sep 20, 2022 · 0c9fede · 0c9fede
1 parent e6c028c
commit 0c9fede
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/pkg/deployment/external_args.go b/pkg/deployment/external_args.go
@@ -28,16 +28,21 @@ func ParseArgs(argsList []string) (map[string]string, error) {
 	return args, nil
 }
 
-func ConvertArgsToVars(args map[string]string) *uo.UnstructuredObject {
+func ConvertArgsToVars(args map[string]string) (*uo.UnstructuredObject, error) {
 	vars := uo.New()
 	for n, v := range args {
 		var p []interface{}
 		for _, x := range strings.Split(n, ".") {
 			p = append(p, x)
 		}
-		_ = vars.SetNestedField(v, p...)
+		var j any
+		err := yaml.ReadYamlString(v, &j)
+		if err != nil {
+			return nil, err
+		}
+		_ = vars.SetNestedField(j, p...)
 	}
-	return vars
+	return vars, nil
 }
 
 func CheckRequiredDeployArgs(dir string, varsCtx *vars.VarsCtx, deployArgs *uo.UnstructuredObject) error {

diff --git a/pkg/kluctl_project/target_context.go b/pkg/kluctl_project/target_context.go
@@ -151,7 +151,11 @@ func (p *LoadedKluctlProject) buildVars(target *types.Target, clusterName *strin
 			}
 		}
 	}
-	allArgs.Merge(deployment.ConvertArgsToVars(args))
+	convertedArgs, err := deployment.ConvertArgsToVars(args)
+	if err != nil {
+		return doError(err)
+	}
+	allArgs.Merge(convertedArgs)
 	if target != nil {
 		if target.Args != nil {
 			allArgs.Merge(target.Args)