fix: EvalScript issues (#458)

* fix(api): EvalScript can be used with environments * fix(cli): only add evalPattern if set
grafana · Dec 31, 2020 · aee9fd4 · aee9fd4
1 parent dc54501
commit aee9fd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cmd/tk/jsonnet.go b/cmd/tk/jsonnet.go
@@ -27,7 +27,9 @@ func evalCmd() *cli.Command {
 		jsonnetOpts := tanka.Opts{
 			JsonnetOpts: getJsonnetOpts(),
 		}
-		jsonnetOpts.EvalScript = "(import '%s')." + *evalPattern
+		if *evalPattern != "" {
+			jsonnetOpts.EvalScript = "(import '%s')." + *evalPattern
+		}
 		raw, err := tanka.Eval(args[0], jsonnetOpts)
 
 		if raw == nil && err != nil {

diff --git a/pkg/tanka/parse.go b/pkg/tanka/parse.go
@@ -152,11 +152,6 @@ func ParseEnv(path string, opts JsonnetOpts) (interface{}, *v1alpha1.Environment
 		return nil, nil, errors.Wrap(err, "unmarshalling data")
 	}
 
-	if opts.EvalScript != "" {
-		// EvalScript has no affinity with an environment, behave as jsonnet interpreter
-		return data, nil, nil
-	}
-
 	extractedEnvs, err := extractEnvironments(data)
 	if _, ok := err.(process.ErrorPrimitiveReached); ok {
 		if specEnv == nil {