alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improving certain CLI commands: init, run (#207)

Browse Source 
* Consolidating route type utilization

Fixes: #197

* Adding --version to fn init CLI command

* Updating functions_go to 0.1.36

* Updating route init process

* Updating tests

* Adding "memory" CLI flag to fn run

* Make CLI memory flag override what's in func.yaml

* Get rid of default value for memory flag

* Revert UX impact

 func.yaml remains the same, no nested maps
This commit is contained in:
Denis Makogon
2017-08-18 21:14:29 +03:00
committed by Travis Reeder
parent 1730a7d094
commit 24eacbbbbf
69 changed files with 291 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cli/run.go
View File

@@ -56,6 +56,10 @@ func runflags() []cli.Flag {
Name: "runs",
Usage: "for hot functions only, will call the function `runs` times in a row.",
},
cli.Uint64Flag{
Name: "memory",
Usage: "RAM to allocate for function, Units: MB",
},
}
}
@@ -82,12 +86,18 @@ func (r *runCmd) run(c *cli.Context) error {
}
}
// means no memory specified through CLI args
// memory from func.yaml applied
if c.Uint64("memory") != 0 {
ff.Memory = c.Uint64("memory")
}
return runff(ff, stdin(), os.Stdout, os.Stderr, c.String("method"), c.StringSlice("e"), c.StringSlice("link"), c.String("format"), c.Int("runs"))
}
// TODO: share all this stuff with the Docker driver in server or better yet, actually use the Docker driver
func runff(ff *funcfile, stdin io.Reader, stdout, stderr io.Writer, method string, envVars []string, links []string, format string, runs int) error {
sh := []string{"docker", "run", "--rm", "-i"}
sh := []string{"docker", "run", "--rm", "-i", fmt.Sprintf("--memory=%dm", ff.Memory)}
var err error
var env []string // env for the shelled out docker run command
@@ -109,6 +119,7 @@ func runff(ff *funcfile, stdin io.Reader, stdout, stderr io.Writer, method strin
runEnv = append(runEnv, kvEq("APP_NAME", "myapp"))
runEnv = append(runEnv, kvEq("ROUTE", "/hello")) // TODO: should we change this to PATH ?
runEnv = append(runEnv, kvEq("FN_FORMAT", format))
runEnv = append(runEnv, kvEq("MEMORY_MB", fmt.Sprintf("%d", ff.Memory)))
// add user defined envs
runEnv = append(runEnv, envVars...)
@@ -130,7 +141,7 @@ func runff(ff *funcfile, stdin io.Reader, stdout, stderr io.Writer, method strin
runs = 1
}
if ff.Type != nil && *ff.Type == "async" {
if ff.Type != "" && ff.Type == "async" {
// if async, we'll run this in a separate thread and wait for it to complete
// reqID := id.New().String()
// I'm starting to think maybe `fn run` locally should work the same whether sync or async? Or how would we allow to test the output?