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

fnctl: improve route creation if func.yaml is present (#280)

Browse Source
This commit is contained in:
C Cirello
2016-11-15 01:34:27 +01:00
committed by GitHub
parent 35ac5398b6
commit 23a7f3ca31
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fnctl/routes.go
View File

@@ -172,8 +172,8 @@ func envAsHeader(req *http.Request, selectedEnv []string) {
}
func (a *routesCmd) create(c *cli.Context) error {
if c.Args().Get(0) == "" || c.Args().Get(1) == "" || c.Args().Get(2) == "" {
return errors.New("error: routes listing takes three arguments: an app name, a route path and an image")
if c.Args().Get(0) == "" || c.Args().Get(1) == "" {
return errors.New("error: routes creation takes three arguments: an app name, a route path and an image")
}
if err := resetBasePath(&a.Configuration); err != nil {
@@ -183,6 +183,18 @@ func (a *routesCmd) create(c *cli.Context) error {
appName := c.Args().Get(0)
route := c.Args().Get(1)
image := c.Args().Get(2)
if image == "" {
ff, err := findFuncfile()
if err != nil {
if _, ok := err.(*NotFoundError); ok {
return errors.New("error: image name is missing or no function file found")
} else {
return err
}
}
image = ff.FullName()
}
body := functions.RouteWrapper{
Route: functions.Route{
AppName: appName,

1
fnctl/run.go
View File

@@ -36,7 +36,6 @@ func runflags() []cli.Flag {
func (r *runCmd) run(c *cli.Context) error {
image := c.Args().First()
if image == "" {
// check for a funcfile
ff, err := findFuncfile()
if err != nil {
if _, ok := err.(*NotFoundError); ok {