From 8cdc97a0ddcf8f8bb0266d6b777325b39ef6511b Mon Sep 17 00:00:00 2001
From: Donny Xia <donnyxia@google.com>
Date: Wed, 5 Aug 2020 11:56:19 -0700
Subject: [PATCH] code review

---
 kyaml/fn/runtime/container/container.go      | 17 +++--------------
 kyaml/fn/runtime/container/container_test.go | 12 ++++--------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/kyaml/fn/runtime/container/container.go b/kyaml/fn/runtime/container/container.go
index 806d36702..a561a9bf8 100644
--- a/kyaml/fn/runtime/container/container.go
+++ b/kyaml/fn/runtime/container/container.go
@@ -189,13 +189,15 @@ func (c *Filter) getCommand() (string, []string) {
 		args = append(args, "--mount", storageMount.String())
 	}
 
+	// TODO: put these env processes into a separate function and call it in the outside of
+	// getCommand
 	os.Setenv("LOG_TO_STDERR", "true")
 	os.Setenv("STRUCTURED_RESULTS", "true")
 
 	// export the local environment vars to the container
 	for _, pair := range os.Environ() {
 		items := strings.Split(pair, "=")
-		if items[0] == "" || items[1] == "" || shouldEnvIgnored(items[0]) {
+		if items[0] == "" || items[1] == "" || items[0] == "TMPDIR" {
 			continue
 		}
 		args = append(args, "-e", items[0])
@@ -203,16 +205,3 @@ func (c *Filter) getCommand() (string, []string) {
 	a := append(args, c.Image)
 	return "docker", a
 }
-
-var ignoreEnvKey []string = []string{"TMPDIR"}
-
-// shouldEnvIgnored returns true if the environment variable key should be ignored
-// by the container runtime.
-func shouldEnvIgnored(envKey string) bool {
-	for _, k := range ignoreEnvKey {
-		if k == envKey {
-			return true
-		}
-	}
-	return false
-}
diff --git a/kyaml/fn/runtime/container/container_test.go b/kyaml/fn/runtime/container/container_test.go
index c5907576b..df4375db2 100644
--- a/kyaml/fn/runtime/container/container_test.go
+++ b/kyaml/fn/runtime/container/container_test.go
@@ -106,7 +106,7 @@ metadata:
 			for _, e := range os.Environ() {
 				// the process env
 				parts := strings.Split(e, "=")
-				if parts[0] == "" || parts[1] == "" || shouldEnvIgnored(parts[0]) {
+				if parts[0] == "" || parts[1] == "" || parts[0] == "TMPDIR" {
 					continue
 				}
 				tt.expectedArgs = append(tt.expectedArgs, "-e", parts[0])
@@ -212,17 +212,13 @@ func TestFilter_ExitCode(t *testing.T) {
 }
 
 func TestIgnoreEnv(t *testing.T) {
-	for _, key := range ignoreEnvKey {
-		os.Setenv(key, "")
-	}
+	os.Setenv("TMPDIR", "")
 
 	fltr := Filter{Image: "example.com:version"}
 	_, args := fltr.getCommand()
 	for _, arg := range args {
-		for _, key := range ignoreEnvKey {
-			if arg == key {
-				t.Fatalf("%s should not be exported to container", key)
-			}
+		if arg == "TMPDIR" {
+			t.Fatalf("TMPDIR should not be exported to container")
 		}
 	}
 }