Remove redundant env field

kyaml/fn/runtime/container/container.go

@@ -152,8 +152,6 @@ func (c *Filter) setupExec() {
 	c.Exec.Args = args
 }
 
-var tmpDirEnvKey string = "TMPDIR"
-
 // getArgs returns the command + args to run to spawn the container
 func (c *Filter) getCommand() (string, []string) {
 	// run the container using docker.  this is simpler than using the docker
@@ -175,7 +173,7 @@ func (c *Filter) getCommand() (string, []string) {
 		args = append(args, "--mount", storageMount.String())
 	}
 
-	args = append(args, c.Env.GetDockerFlags()...)
+	args = append(args, runtimeutil.NewContainerEnvFromStringSlice(c.Env).GetDockerFlags()...)
 	a := append(args, c.Image)
 	return "docker", a
 }

kyaml/fn/runtime/container/container_test.go

@@ -6,7 +6,6 @@ package container
 import (
 	"bytes"
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -135,10 +134,11 @@ metadata:
 				t.FailNow()
 			}
 			tt.instance.Exec.FunctionConfig = cfg
-			tt.instance.Env.AddKeyValue("KYAML_TEST", "FOO")
+			tt.instance.Env = append(tt.instance.Env, "KYAML_TEST=FOO")
 			tt.instance.setupExec()
 
-			tt.expectedArgs = append(tt.expectedArgs, tt.instance.Env.GetDockerFlags()...)
+			tt.expectedArgs = append(tt.expectedArgs,
+				runtimeutil.NewContainerEnvFromStringSlice(tt.instance.Env).GetDockerFlags()...)
 			tt.expectedArgs = append(tt.expectedArgs, tt.instance.Image)
 
 			if !assert.Equal(t, "docker", tt.instance.Exec.Path) {
@@ -238,15 +238,3 @@ func TestFilter_ExitCode(t *testing.T) {
 		t.FailNow()
 	}
 }
-
-func TestIgnoreEnv(t *testing.T) {
-	os.Setenv(tmpDirEnvKey, "")
-
-	fltr := Filter{ContainerSpec: runtimeutil.ContainerSpec{Image: "example.com:version"}}
-	_, args := fltr.getCommand()
-	for _, arg := range args {
-		if arg == tmpDirEnvKey {
-			t.Fatalf("%s should not be exported to container", tmpDirEnvKey)
-		}
-	}
-}

kyaml/fn/runtime/runtimeutil/functiontypes.go

@@ -102,6 +102,18 @@ func (ce *ContainerEnv) AddKey(key string) {
 	}
 }
 
+// Raw returns a slice of string which represents the envs.
+// Example: [foo=bar, baz]
+func (ce *ContainerEnv) Raw() []string {
+	var ret []string
+	for k, v := range ce.EnvVars {
+		ret = append(ret, k+"="+v)
+	}
+
+	ret = append(ret, ce.VarsToExport...)
+	return ret
+}
+
 // NewContainerEnv returns a pointer to a new ContainerEnv
 func NewContainerEnv() *ContainerEnv {
 	var ce ContainerEnv
@@ -162,11 +174,8 @@ type ContainerSpec struct {
 	// User is the username/uid that application runs as in continer
 	User ContainerUser `json:"user,omitempty" yaml:"user,omitempty"`
 
-	// EnvRaw is a slice of env string.
-	EnvRaw []string `json:"envs,omitempty" yaml:"envs,omitempty"`
-
-	// Env contains environment variables that will be exported to container
-	Env ContainerEnv `json:"-" yaml:"-"`
+	// Env is a slice of env string that will be exposed to container
+	Env []string `json:"envs,omitempty" yaml:"envs,omitempty"`
 }
 
 // ContainerNetwork
@@ -230,7 +239,6 @@ func GetFunctionSpec(n *yaml.RNode) *FunctionSpec {
 	if fn := getFunctionSpecFromAnnotation(n, meta); fn != nil {
 		fn.Container.Network.Name = NetworkNameEmpty
 		fn.StorageMounts = []StorageMount{}
-		fn.Container.Env = *NewContainerEnvFromStringSlice(fn.Container.EnvRaw)
 		return fn
 	}
 

kyaml/fn/runtime/runtimeutil/runtimeutil_test.go

@@ -1514,6 +1514,6 @@ metadata:
 			return
 		}
 		fn := GetFunctionSpec(cfg)
-		assert.Equal(t, tc.expected, fn.Container.Env)
+		assert.Equal(t, tc.expected, *NewContainerEnvFromStringSlice(fn.Container.Env))
 	}
 }