Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract portforward to separate package (#728)

Browse Source 
* Extract port-forward from CLI to own package (for reuseability)
* Extract CLI logging to subpackage
This commit is contained in:
Erwin van Eyk
2018-06-13 11:26:39 +08:00
committed by Ta-Ching Chen
parent ddff7100e9
commit cf1f944069
13 changed files with 239 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fission/httptrigger.go
+7 -6
View File
@@ -30,6 +30,7 @@ import (
"github.com/fission/fission"
"github.com/fission/fission/controller/client"
"github.com/fission/fission/crd"
"github.com/fission/fission/fission/log"
)
// returns one of http.Method*
@@ -54,7 +55,7 @@ func getMethod(method string) string {
case "TRACE":
return http.MethodTrace
}
fatal(fmt.Sprintf("Invalid HTTP Method %v", method))
log.Fatal(fmt.Sprintf("Invalid HTTP Method %v", method))
return ""
}
@@ -75,13 +76,13 @@ func htCreate(c *cli.Context) error {
fnName := c.String("function")
if len(fnName) == 0 {
fatal("Need a function name to create a trigger, use --function")
log.Fatal("Need a function name to create a trigger, use --function")
}
fnNamespace := c.String("fnNamespace")
triggerUrl := c.String("url")
if len(triggerUrl) == 0 {
fatal("Need a trigger URL, use --url")
log.Fatal("Need a trigger URL, use --url")
}
if !strings.HasPrefix(triggerUrl, "/") {
triggerUrl = fmt.Sprintf("/%s", triggerUrl)
@@ -143,14 +144,14 @@ func htUpdate(c *cli.Context) error {
client := getClient(c.GlobalString("server"))
htName := c.String("name")
if len(htName) == 0 {
fatal("Need name of trigger, use --name")
log.Fatal("Need name of trigger, use --name")
}
triggerNamespace := c.String("triggerNamespace")
// update function ref
newFn := c.String("function")
if len(newFn) == 0 {
fatal("Nothing to update. Use --function to specify a new function.")
log.Fatal("Nothing to update. Use --function to specify a new function.")
}
checkFunctionExistence(client, newFn, triggerNamespace)
@@ -184,7 +185,7 @@ func htDelete(c *cli.Context) error {
client := getClient(c.GlobalString("server"))
htName := c.String("name")
if len(htName) == 0 {
fatal("Need name of trigger to delete, use --name")
log.Fatal("Need name of trigger to delete, use --name")
}
triggerNamespace := c.String("triggerNamespace")