From aee9fd481b6728f75bcee62319ed7449bda421a7 Mon Sep 17 00:00:00 2001
From: Jeroen Op 't Eynde <jeroen@grafana.com>
Date: Thu, 31 Dec 2020 01:17:26 +0100
Subject: [PATCH] fix: EvalScript issues (#458)

* fix(api): EvalScript can be used with environments

* fix(cli): only add evalPattern if set
---
 cmd/tk/jsonnet.go  | 4 +++-
 pkg/tanka/parse.go | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cmd/tk/jsonnet.go b/cmd/tk/jsonnet.go
index 16fb5f085..628c81caa 100644
--- 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
index fa3e97eff..778ea501d 100644
--- 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 {