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/timetrigger.go
+8 -7
View File
@@ -30,12 +30,13 @@ import (
"github.com/fission/fission"
"github.com/fission/fission/controller/client"
"github.com/fission/fission/crd"
"github.com/fission/fission/fission/log"
)
func getAPITimeInfo(client *client.Client) time.Time {
serverInfo, err := client.ServerInfo()
if err != nil {
fatal(fmt.Sprintf("Error syncing server time information: %v", err))
log.Fatal(fmt.Sprintf("Error syncing server time information: %v", err))
}
return serverInfo.ServerTime.CurrentTime
}
@@ -65,14 +66,14 @@ func ttCreate(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")
cronSpec := c.String("cron")
if len(cronSpec) == 0 {
fatal("Need a cron spec like '0 30 * * * *', '@every 1h30m', or '@hourly'; use --cron")
log.Fatal("Need a cron spec like '0 30 * * * *', '@every 1h30m', or '@hourly'; use --cron")
}
tt := &crd.TimeTrigger{
@@ -116,7 +117,7 @@ func ttUpdate(c *cli.Context) error {
client := getClient(c.GlobalString("server"))
ttName := c.String("name")
if len(ttName) == 0 {
fatal("Need name of trigger, use --name")
log.Fatal("Need name of trigger, use --name")
}
ttNs := c.String("triggerns")
@@ -143,7 +144,7 @@ func ttUpdate(c *cli.Context) error {
}
if !updated {
fatal("Nothing to update. Use --cron or --function.")
log.Fatal("Nothing to update. Use --cron or --function.")
}
_, err = client.TimeTriggerUpdate(tt)
@@ -161,7 +162,7 @@ func ttDelete(c *cli.Context) error {
client := getClient(c.GlobalString("server"))
ttName := c.String("name")
if len(ttName) == 0 {
fatal("Need name of trigger to delete, use --name")
log.Fatal("Need name of trigger to delete, use --name")
}
ttNs := c.String("triggerns")
@@ -200,7 +201,7 @@ func ttTest(c *cli.Context) error {
round := c.Int("round")
cronSpec := c.String("cron")
if len(cronSpec) == 0 {
fatal("Need a cron spec like '0 30 * * * *', '@every 1h30m', or '@hourly'; use --cron")
log.Fatal("Need a cron spec like '0 30 * * * *', '@every 1h30m', or '@hourly'; use --cron")
}
err := getCronNextNActivationTime(cronSpec, getAPITimeInfo(client), round)