use latest core client to support HA & LB

CMGS · CMGS · commit 8ec9e6700c1d · 2020-08-17T13:51:31.000+08:00
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -11,14 +11,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 
 
       - name: Set up environment variables
         run: |
           echo "::set-env name=VERSION::$(git describe --tags $(git rev-list --tags --max-count=1))"
 
-      - name: Unshallow
-        run: git fetch --prune --unshallow
-
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
diff --git a/commands/container.go b/commands/container.go
@@ -677,7 +677,7 @@ func setContainersStatus(c *cli.Context) error {
 }
 
 func listContainers(c *cli.Context) error {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 
 	opts := &pb.ListContainersOptions{
 		Appname:    c.Args().First(),
@@ -784,7 +784,7 @@ func reallocContainers(c *cli.Context) error {
 }
 
 func execContainer(c *cli.Context) (err error) {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 
 	opts := &pb.ExecuteContainerOptions{
 		ContainerId: c.Args().First(),
diff --git a/commands/core.go b/commands/core.go
@@ -23,7 +23,7 @@ func CoreCommand() *cli.Command {
 }
 
 func info(c *cli.Context) error {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 	opts := &pb.Empty{}
 	coreInfo, err := client.Info(c.Context, opts)
 	if err != nil {
diff --git a/commands/image.go b/commands/image.go
@@ -115,7 +115,7 @@ func ImageCommand() *cli.Command {
 
 func buildImage(c *cli.Context) error {
 	opts := generateBuildOpts(c)
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 	resp, err := client.BuildImage(context.Background(), opts)
 	if err != nil {
 		return cli.Exit(err, -1)
@@ -175,7 +175,7 @@ func cacheImage(c *cli.Context) error {
 		Nodename: c.String("nodename"),
 	}
 
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 	resp, err := client.CacheImage(context.Background(), opts)
 	if err != nil {
 		return cli.Exit(err, -1)
@@ -206,7 +206,7 @@ func cleanImage(c *cli.Context) error {
 		Nodename: c.String("nodename"),
 		Prune:    c.Bool("prune"),
 	}
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 	resp, err := client.RemoveImage(context.Background(), opts)
 	if err != nil {
 		return cli.Exit(err, -1)
diff --git a/commands/lambda.go b/commands/lambda.go
@@ -24,7 +24,7 @@ type window struct {
 }
 
 func runLambda(c *cli.Context) error {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 	code, err := lambda(c, client)
 	if err == nil {
 		return cli.Exit("", code)
diff --git a/commands/main.go b/commands/main.go
@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/projecteru2/core/client"
@@ -84,18 +85,22 @@ func GlobalFlags() []cli.Flag {
 	}
 }
 
-func setupAndGetGRPCConnection() *client.Client {
+func setupAndGetGRPCConnection(ctx context.Context) *client.Client {
 	_ = setupLog("INFO")
 	if debug {
 		_ = setupLog("DEBUG")
 	}
 
-	return client.NewClient(eru, types.AuthConfig{Username: username, Password: password})
+	cli, err := client.NewClient(ctx, eru, types.AuthConfig{Username: username, Password: password})
+	if err != nil {
+		log.Fatalf("[setupAndGetGRPCConnection] create client failed %v", err)
+	}
+	return cli
 }
 
 func checkParamsAndGetClient(c *cli.Context) (pb.CoreRPCClient, error) {
 	if c.NArg() == 0 {
 		return nil, fmt.Errorf("not specify arguments")
 	}
-	return setupAndGetGRPCConnection().GetRPCClient(), nil
+	return setupAndGetGRPCConnection(c.Context).GetRPCClient(), nil
 }
diff --git a/commands/node.go b/commands/node.go
@@ -188,7 +188,7 @@ func NodeCommand() *cli.Command {
 }
 
 func listNodeContainers(c *cli.Context) error {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 
 	nodename := c.Args().First()
 	if nodename == "" {
diff --git a/commands/pod.go b/commands/pod.go
@@ -77,7 +77,7 @@ func PodCommand() *cli.Command {
 }
 
 func listPods(c *cli.Context) error {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 	resp, err := client.ListPods(context.Background(), &pb.Empty{})
 	if err != nil {
 		log.Fatalf("[ListPods] send request failed %v", err)
diff --git a/commands/publish.go b/commands/publish.go
@@ -81,7 +81,7 @@ func dumpELB(c *cli.Context) error {
 }
 
 func publishContainers(c *cli.Context) error {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 
 	app := c.String("app")
 	elb := c.String("elb")
diff --git a/commands/status.go b/commands/status.go
@@ -14,7 +14,7 @@ import (
 )
 
 func status(c *cli.Context) error {
-	client := setupAndGetGRPCConnection().GetRPCClient()
+	client := setupAndGetGRPCConnection(c.Context).GetRPCClient()
 	name := c.Args().First()
 	entry := c.String("entry")
 	node := c.String("node")
diff --git a/go.mod b/go.mod
@@ -3,31 +3,23 @@ module github.com/projecteru2/cli
 go 1.13
 
 require (
-	github.com/Microsoft/go-winio v0.4.14 // indirect
-	github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v0.0.0-20181113085551-758255791e25
-	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.4.0
 	github.com/getlantern/deepcopy v0.0.0-20160317154340-7f45deb8130a
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-openapi/strfmt v0.19.5 // indirect
-	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/gorilla/mux v1.7.3 // indirect
 	github.com/jedib0t/go-pretty v1.0.1-0.20200513164024-8b58fbaf3b31
 	github.com/kless/term v0.0.0-20161130133337-e551c64f56c0 // indirect
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/opencontainers/runc v0.1.1 // indirect
 	github.com/pkg/term v0.0.0-20190109203006-aa71e9d9e942
-	github.com/projecteru2/core v0.0.0-20200811170522-fd80ffd0b9ed
-	github.com/prometheus/client_golang v1.3.0 // indirect
-	github.com/prometheus/common v0.8.0 // indirect
+	github.com/projecteru2/core v0.0.0-20200817033302-333f86113b59
 	github.com/sethgrid/curse v0.0.0-20180215154548-b3ce8a719db2
-	github.com/sirupsen/logrus v1.4.2
+	github.com/sirupsen/logrus v1.6.0
 	github.com/stretchr/testify v1.6.1
 	github.com/tredoe/term v0.0.0-20161130133337-e551c64f56c0 // indirect
 	github.com/urfave/cli/v2 v2.2.0
-	golang.org/x/net v0.0.0-20200319234117-63522dbf7eec
+	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	gopkg.in/yaml.v2 v2.3.0
+	gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c // indirect
 )
diff --git a/go.sum b/go.sum

Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,7 @@ func setContainersStatus(c *cli.Context) error {`
`677`	`677`	`}`
`678`	`678`
`679`	`679`	`func listContainers(c *cli.Context) error {`
`680`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`680`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`681`	`681`
`682`	`682`	`opts := &pb.ListContainersOptions{`
`683`	`683`	`Appname: c.Args().First(),`
`@@ -784,7 +784,7 @@ func reallocContainers(c *cli.Context) error {`
`784`	`784`	`}`
`785`	`785`
`786`	`786`	`func execContainer(c *cli.Context) (err error) {`
`787`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`787`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`788`	`788`
`789`	`789`	`opts := &pb.ExecuteContainerOptions{`
`790`	`790`	`ContainerId: c.Args().First(),`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func CoreCommand() *cli.Command {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func info(c *cli.Context) error {`
`26`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`26`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`27`	`27`	`opts := &pb.Empty{}`
`28`	`28`	`coreInfo, err := client.Info(c.Context, opts)`
`29`	`29`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ type window struct {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func runLambda(c *cli.Context) error {`
`27`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`27`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`28`	`28`	`code, err := lambda(c, client)`
`29`	`29`	`if err == nil {`
`30`	`30`	`return cli.Exit("", code)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package commands`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "context"`
`4`	`5`	`"fmt"`
`5`	`6`
`6`	`7`	`"github.com/projecteru2/core/client"`
`@@ -84,18 +85,22 @@ func GlobalFlags() []cli.Flag {`
`84`	`85`	`}`
`85`	`86`	`}`
`86`	`87`
`87`		`-func setupAndGetGRPCConnection() *client.Client {`
	`88`	`+func setupAndGetGRPCConnection(ctx context.Context) *client.Client {`
`88`	`89`	`_ = setupLog("INFO")`
`89`	`90`	`if debug {`
`90`	`91`	`_ = setupLog("DEBUG")`
`91`	`92`	`}`
`92`	`93`
`93`		`- return client.NewClient(eru, types.AuthConfig{Username: username, Password: password})`
	`94`	`+ cli, err := client.NewClient(ctx, eru, types.AuthConfig{Username: username, Password: password})`
	`95`	`+ if err != nil {`
	`96`	`+ log.Fatalf("[setupAndGetGRPCConnection] create client failed %v", err)`
	`97`	`+ }`
	`98`	`+ return cli`
`94`	`99`	`}`
`95`	`100`
`96`	`101`	`func checkParamsAndGetClient(c *cli.Context) (pb.CoreRPCClient, error) {`
`97`	`102`	`if c.NArg() == 0 {`
`98`	`103`	`return nil, fmt.Errorf("not specify arguments")`
`99`	`104`	`}`
`100`		`- return setupAndGetGRPCConnection().GetRPCClient(), nil`
	`105`	`+ return setupAndGetGRPCConnection(c.Context).GetRPCClient(), nil`
`101`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func NodeCommand() *cli.Command {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`func listNodeContainers(c *cli.Context) error {`
`191`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`191`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`192`	`192`
`193`	`193`	`nodename := c.Args().First()`
`194`	`194`	`if nodename == "" {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func PodCommand() *cli.Command {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`func listPods(c *cli.Context) error {`
`80`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`80`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`81`	`81`	`resp, err := client.ListPods(context.Background(), &pb.Empty{})`
`82`	`82`	`if err != nil {`
`83`	`83`	`log.Fatalf("[ListPods] send request failed %v", err)`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func dumpELB(c *cli.Context) error {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`func publishContainers(c *cli.Context) error {`
`84`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`84`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`85`	`85`
`86`	`86`	`app := c.String("app")`
`87`	`87`	`elb := c.String("elb")`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func status(c *cli.Context) error {`
`17`		`- client := setupAndGetGRPCConnection().GetRPCClient()`
	`17`	`+ client := setupAndGetGRPCConnection(c.Context).GetRPCClient()`
`18`	`18`	`name := c.Args().First()`
`19`	`19`	`entry := c.String("entry")`
`20`	`20`	`node := c.String("node")`