Merge pull request #568 from jirtosterone/feature/merge-ext-vars-from-cli-and-files

Fix ext_str/ext_code from option file being overridden by CLI args

Author: fujiwara

cli.go

@@ -117,8 +117,10 @@ func ParseCLI(args []string) (string, *CLIOptions, func(), error) {
 	kongOpts := []kong.Option{kong.Vars{"version": Version}}
 
 	// load default options
+	var defaultOpt *Option
 	if optionFilePath != "" {
-		defaultOpt, err := loadDefinitionFile[Option](nil, optionFilePath, nil)
+		var err error
+		defaultOpt, err = loadDefinitionFile[Option](nil, optionFilePath, nil)
 		if err != nil {
 			return "", nil, nil, fmt.Errorf("failed to load option file: %w", err)
 		}
@@ -148,6 +150,17 @@ func ParseCLI(args []string) (string, *CLIOptions, func(), error) {
 	}
 	opts.Envfile = lo.Uniq(envfiles) // envfiles are parsed before, so it's safe to overwrite
 
+	// Merge ext_str and ext_code from option file with CLI args
+	// CLI args take precedence over option file values
+	if defaultOpt != nil {
+		if defaultOpt.ExtStr != nil || opts.ExtStr != nil {
+			opts.ExtStr = lo.Assign(defaultOpt.ExtStr, opts.ExtStr)
+		}
+		if defaultOpt.ExtCode != nil || opts.ExtCode != nil {
+			opts.ExtCode = lo.Assign(defaultOpt.ExtCode, opts.ExtCode)
+		}
+	}
+
 	sub := strings.Fields(c.Command())[0]
 	return sub, &opts, func() { c.PrintUsage(true) }, nil
 }

cli_test.go

@@ -195,6 +195,32 @@ var cliTests = []struct {
 			},
 		},
 	},
+	{
+		// Test: CLI args are merged with option file, CLI takes precedence
+		args: []string{
+			"render", "--option", "ext_vars.jsonnet",
+			"--ext-str", "cli_key=cli_val",
+			"--ext-str", "architecture=arm64",
+			"--ext-code", "memory_size=256",
+			"--ext-code", "storage_size=1024",
+		},
+		sub: "render",
+		option: &lambroll.Option{
+			OptionFilePath: "ext_vars.jsonnet",
+			Color:          true,
+			Envfile:        []string{},
+			ExtStr: map[string]string{
+				"architecture": "arm64",                                   // CLI overrides option file (x86_64 -> arm64)
+				"description":  "Test function with ext_str and ext_code", // from option file
+				"cli_key":      "cli_val",                                 // from CLI
+			},
+			ExtCode: map[string]string{
+				"memory_size":  "256",  // CLI overrides option file (128 -> 256)
+				"storage_size": "1024", // CLI overrides option file (512 -> 1024)
+				"timeout":      "30",   // from option file
+			},
+		},
+	},
 }
 
 func TestParseCLI(t *testing.T) {