From 91b779269fe78d9039942a1729b4a02df4b1efa6 Mon Sep 17 00:00:00 2001
From: Donny Xia <donnyxia@google.com>
Date: Fri, 28 Aug 2020 10:42:30 -0700
Subject: [PATCH] remove --fn-user and --fn-env flags

---
 cmd/config/internal/commands/run-fns.go  |  9 -----
 cmd/config/internal/commands/run_test.go | 46 ------------------------
 2 files changed, 55 deletions(-)

diff --git a/cmd/config/internal/commands/run-fns.go b/cmd/config/internal/commands/run-fns.go
index f34ec7ad7..2ae82adae 100644
--- a/cmd/config/internal/commands/run-fns.go
+++ b/cmd/config/internal/commands/run-fns.go
@@ -65,11 +65,6 @@ func GetRunFnRunner(name string) *RunFnRunner {
 	r.Command.Flags().StringArrayVar(
 		&r.Mounts, "mount", []string{},
 		"a list of storage options read from the filesystem")
-	r.Command.Flags().StringVar(
-		&r.User, "fn-user", "nobody", "the username/uid used to run function in container")
-	r.Command.Flags().StringArrayVar(
-		&r.Env, "fn-env", []string{},
-		"a list of environment variables that will be exposed to container. Each item can be key=value pair or a key name of exported env.")
 	return r
 }
 
@@ -96,8 +91,6 @@ type RunFnRunner struct {
 	Network            bool
 	NetworkName        string
 	Mounts             []string
-	User               string
-	Env                []string
 }
 
 func (r *RunFnRunner) runE(c *cobra.Command, args []string) error {
@@ -312,8 +305,6 @@ func (r *RunFnRunner) preRunE(c *cobra.Command, args []string) error {
 		EnableExec:     r.EnableExec,
 		StorageMounts:  storageMounts,
 		ResultsDir:     r.ResultsDir,
-		User:           runtimeutil.ContainerUser(r.User),
-		Env:            r.Env,
 	}
 
 	// don't consider args for the function
diff --git a/cmd/config/internal/commands/run_test.go b/cmd/config/internal/commands/run_test.go
index b4eadacab..7a3bf6939 100644
--- a/cmd/config/internal/commands/run_test.go
+++ b/cmd/config/internal/commands/run_test.go
@@ -203,8 +203,6 @@ apiVersion: v1
 				Path:           "dir",
 				NetworkName:    "bridge",
 				EnableStarlark: true,
-				User:           "nobody",
-				Env:            []string{},
 			},
 		},
 		{
@@ -258,8 +256,6 @@ apiVersion: v1
 				Path:        "dir",
 				NetworkName: "bridge",
 				ResultsDir:  "foo/",
-				User:        "nobody",
-				Env:         []string{},
 			},
 			expected: `
 metadata:
@@ -287,48 +283,6 @@ apiVersion: v1
 			args: []string{"run", "dir", "--image", "foo:bar", "--", "a=b", "c", "e=f"},
 			err:  "must have keys and values separated by",
 		},
-		{
-			name: "specify username",
-			args: []string{"run", "dir", "--fn-user", "root", "--image", "foo:bar"},
-			path: "dir",
-			expectedStruct: &runfn.RunFns{
-				Path:        "dir",
-				NetworkName: "bridge",
-				User:        "root",
-				Env:         []string{},
-			},
-			expected: `
-metadata:
-  name: function-input
-  annotations:
-    config.kubernetes.io/function: |
-      container: {image: 'foo:bar'}
-data: {}
-kind: ConfigMap
-apiVersion: v1
-`,
-		},
-		{
-			name: "specify env",
-			args: []string{"run", "dir", "--fn-env", "foo=bar", "--fn-env", "baz", "--image", "foo:bar"},
-			path: "dir",
-			expectedStruct: &runfn.RunFns{
-				Path:        "dir",
-				NetworkName: "bridge",
-				User:        "nobody",
-				Env:         []string{"foo=bar", "baz"},
-			},
-			expected: `
-metadata:
-  name: function-input
-  annotations:
-    config.kubernetes.io/function: |
-      container: {image: 'foo:bar'}
-data: {}
-kind: ConfigMap
-apiVersion: v1
-`,
-		},
 	}
 
 	for i := range tests {