feat: allow using external variables in export and env list (#1112)

* Plumb JSonnetOpts to recursive export and env list * Lint: Remove extra newline Co-authored-by: Horst Gutmann <[email protected]> --------- Co-authored-by: Horst Gutmann <[email protected]>
grafana · Jul 30, 2024 · 80ffbfd · 80ffbfd
1 parent 2f62276
commit 80ffbfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/tk/env.go b/cmd/tk/env.go
@@ -241,6 +241,8 @@ func envListCmd() *cli.Command {
 
 	useNames := cmd.Flags().Bool("names", false, "plain names output")
 
+	getJsonnetOpts := jsonnetFlags(cmd.Flags())
+
 	cmd.Run = func(cmd *cli.Command, args []string) error {
 		var path string
 		var err error
@@ -253,7 +255,7 @@ func envListCmd() *cli.Command {
 			}
 		}
 
-		envs, err := tanka.FindEnvs(path, tanka.FindOpts{Selector: getLabelSelector()})
+		envs, err := tanka.FindEnvs(path, tanka.FindOpts{Selector: getLabelSelector(), JsonnetOpts: getJsonnetOpts()})
 		if err != nil {
 			return err
 		}

diff --git a/cmd/tk/export.go b/cmd/tk/export.go
@@ -89,7 +89,7 @@ func exportCmd() *cli.Command {
 		// find possible environments
 		if *recursive {
 			// get absolute path to Environment
-			envs, err := tanka.FindEnvsFromPaths(args[1:], tanka.FindOpts{Selector: opts.Selector, Parallelism: opts.Parallelism})
+			envs, err := tanka.FindEnvsFromPaths(args[1:], tanka.FindOpts{Selector: opts.Selector, Parallelism: opts.Parallelism, JsonnetOpts: opts.Opts.JsonnetOpts})
 			if err != nil {
 				return err
 			}