Merge pull request #2988 from Shell32-Natsu/env-flag

Add --env/-e flag to fn run
This commit is contained in:
Jeff Regan
2020-09-15 14:31:40 -07:00
committed by GitHub
2 changed files with 18 additions and 0 deletions

View File

@@ -69,6 +69,9 @@ func GetRunFnRunner(name string) *RunFnRunner {
"a list of storage options read from the filesystem")
r.Command.Flags().BoolVar(
&r.LogSteps, "log-steps", false, "log steps to stderr")
r.Command.Flags().StringArrayVarP(
&r.Env, "env", "e", []string{},
"a list of environment variables to be used by functions")
return r
}
@@ -96,6 +99,7 @@ type RunFnRunner struct {
NetworkName string
Mounts []string
LogSteps bool
Env []string
}
func (r *RunFnRunner) runE(c *cobra.Command, args []string) error {
@@ -311,6 +315,7 @@ func (r *RunFnRunner) preRunE(c *cobra.Command, args []string) error {
StorageMounts: storageMounts,
ResultsDir: r.ResultsDir,
LogSteps: r.LogSteps,
Env: r.Env,
}
// don't consider args for the function

View File

@@ -204,6 +204,7 @@ apiVersion: v1
Path: "dir",
NetworkName: "bridge",
EnableStarlark: true,
Env: []string{},
},
},
{
@@ -257,6 +258,7 @@ apiVersion: v1
Path: "dir",
NetworkName: "bridge",
ResultsDir: "foo/",
Env: []string{},
},
expected: `
metadata:
@@ -292,6 +294,17 @@ apiVersion: v1
Path: "dir",
NetworkName: "bridge",
LogSteps: true,
Env: []string{},
},
},
{
name: "envs",
args: []string{"run", "dir", "--env", "FOO=BAR", "-e", "BAR"},
path: "dir",
expectedStruct: &runfn.RunFns{
Path: "dir",
NetworkName: "bridge",
Env: []string{"FOO=BAR", "BAR"},
},
},
}