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

Merge branch 'minor-cleanups' into 'master'

Browse Source 
Cleanup imports and errors

See merge request !7
This commit is contained in:
James Jeffrey
2017-05-18 15:07:28 +00:00
parent c0cfb268d2 d2b4078b60
commit 521df8c1ff
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fn/deploy.go
View File

@@ -154,7 +154,10 @@ func (p *deploycmd) route(c *cli.Context, ff *funcfile) error {
routesCmd := routesCmd{client: apiClient()} routesCmd := routesCmd{client: apiClient()}
rt := &models.Route{} rt := &models.Route{}
routeWithFuncFile(c, ff, rt)
if err := routeWithFuncFile(c, ff, rt); err != nil {
return fmt.Errorf("error getting route with funcfile: %s", err)
}
return routesCmd.patchRoute(c, p.appName, *ff.Path, rt) return routesCmd.patchRoute(c, p.appName, *ff.Path, rt)
} }

22
fn/routes.go
View File

@@ -15,7 +15,6 @@ import (
fnclient "github.com/iron-io/functions_go/client" fnclient "github.com/iron-io/functions_go/client"
apiroutes "github.com/iron-io/functions_go/client/routes" apiroutes "github.com/iron-io/functions_go/client/routes"
"github.com/iron-io/functions_go/models"
fnmodels "github.com/iron-io/functions_go/models" fnmodels "github.com/iron-io/functions_go/models"
"github.com/jmoiron/jsonq" "github.com/jmoiron/jsonq"
"github.com/urfave/cli" "github.com/urfave/cli"
@@ -247,7 +246,7 @@ func envAsHeader(req *http.Request, selectedEnv []string) {
} }
} }
func routeWithFlags(c *cli.Context, rt *models.Route) { func routeWithFlags(c *cli.Context, rt *fnmodels.Route) {
if i := c.String("image"); i != "" { if i := c.String("image"); i != "" {
rt.Image = i rt.Image = i
} }
@@ -287,7 +286,7 @@ func routeWithFlags(c *cli.Context, rt *models.Route) {
} }
} }
func routeWithFuncFile(c *cli.Context, ff *funcfile, rt *models.Route) error { func routeWithFuncFile(c *cli.Context, ff *funcfile, rt *fnmodels.Route) error {
var err error var err error
if ff == nil { if ff == nil {
ff, err = loadFuncfile() ff, err = loadFuncfile()
@@ -318,11 +317,14 @@ func (a *routesCmd) create(c *cli.Context) error {
appName := c.Args().Get(0) appName := c.Args().Get(0)
route := cleanRoutePath(c.Args().Get(1)) route := cleanRoutePath(c.Args().Get(1))
rt := &models.Route{} rt := &fnmodels.Route{}
rt.Path = route rt.Path = route
rt.Image = c.Args().Get(2) rt.Image = c.Args().Get(2)
routeWithFuncFile(c, nil, rt) if err := routeWithFuncFile(c, nil, rt); err != nil {
return fmt.Errorf("error getting route info: %s", err)
}
routeWithFlags(c, rt) routeWithFlags(c, rt)
if rt.Path == "" { if rt.Path == "" {
@@ -337,7 +339,7 @@ func (a *routesCmd) create(c *cli.Context) error {
func (a *routesCmd) postRoute(c *cli.Context, appName string, rt *fnmodels.Route) error { func (a *routesCmd) postRoute(c *cli.Context, appName string, rt *fnmodels.Route) error {
body := &models.RouteWrapper{ body := &fnmodels.RouteWrapper{
Route: rt, Route: rt,
} }
@@ -457,8 +459,12 @@ func (a *routesCmd) update(c *cli.Context) error {
appName := c.Args().Get(0) appName := c.Args().Get(0)
route := cleanRoutePath(c.Args().Get(1)) route := cleanRoutePath(c.Args().Get(1))
rt := &models.Route{} rt := &fnmodels.Route{}
routeWithFuncFile(c, nil, rt)
if err := routeWithFuncFile(c, nil, rt); err != nil {
return fmt.Errorf("error updating route: %s", err)
}
routeWithFlags(c, rt) routeWithFlags(c, rt)
err := a.patchRoute(c, appName, route, rt) err := a.patchRoute(c, appName, route, rt)