Merge pull request #38 from lixiaojun629/develop

fixbug & refactor

Author: lixiaojun629

Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
 RUN apt-get update && apt-get install wget -y
-RUN wget https://github.com/ucloud/ucloud-cli/releases/download/0.1.21/ucloud-cli-linux-0.1.21-amd64.tgz
-RUN tar -zxf ucloud-cli-linux-0.1.21-amd64.tgz -C /usr/local/bin/
+RUN wget https://github.com/ucloud/ucloud-cli/releases/download/0.1.22/ucloud-cli-linux-0.1.22-amd64.tgz
+RUN tar -zxf ucloud-cli-linux-0.1.22-amd64.tgz -C /usr/local/bin/
 RUN echo "complete -C $(which ucloud) ucloud" >> ~/.bashrc

README.md

@@ -7,7 +7,7 @@ https://docs.ucloud.cn/software/cli/index
 
 ## Installing ucloud-cli on macOS or Linux
 
-**Using Homebrew(Preferred)**
+**Using Homebrew(Recommended on macOS)**
 
 The [Homebrew](https://docs.brew.sh/Installation) package manager may be used on macOS and Linux.
 It could install ucloud-cli and its dependencies automatically by running command below.
@@ -34,7 +34,7 @@ If the error is still unresolved, try the following command for help.
 brew doctor
 ```
 
-**Building from source**
+**Building from source(Recommended if you have golang installed)**
 
 If you have installed git and golang on your platform, you can fetch the source code of ucloud cli from github and complie it by yourself.
 
@@ -44,16 +44,24 @@ cd ucloud-cli
 make install
 ```
 
-**Downloading binary release**
+Upgrade to latest version
+
+```
+cd ucloud-cli
+git pull
+make install
+```
+
+**Downloading binary release(Recommended on Linux)**
 
 Vist the [releases page](https://github.com/ucloud/ucloud-cli/releases) of ucloud cli, and find the appropriate archive for your operating system and architecture.
 Download the archive , check the shasum256 hashcode and extract it to your $PATH
 
 For example
 ```
-curl -OL https://github.com/ucloud/ucloud-cli/releases/download/0.1.20/ucloud-cli-macosx-0.1.20-amd64.tgz
-echo "6953232b20f3474973cf234218097006a2e0d1d049c115da6c0e09c103762d4d *ucloud-cli-macosx-0.1.20-amd64.tgz" | shasum -c
-tar zxf ucloud-cli-macosx-0.1.20-amd64.tgz -C /usr/local/bin/
+curl -OL https://github.com/ucloud/ucloud-cli/releases/download/0.1.22/ucloud-cli-linux-0.1.22-amd64.tgz
+echo "efbfb6d36d99f692b1f9cc7c9e3858047bb7b4fca6205c454098267e660b41d9 *ucloud-cli-linux-0.1.22-amd64.tgz" | shasum -c //check shasum to verify whether the downloaded tarball was hijacked. get the shasum from release page
+tar zxf ucloud-cli-linux-0.1.22-amd64.tgz -C /usr/local/bin/
 ```
 
 ## Installing ucloud cli on Windows
@@ -74,22 +82,22 @@ Download the archive , and extract it. Add binary file ucloud.exe to your enviro
 ## Using ucloud cli in a Docker container
 If you have installed docker on your platform, pull the docker image embeded ucloud cli by follow command.
 ```
-docker pull uhub.service.ucloud.cn/ucloudcli/ucloud-cli:0.1.20
+docker pull uhub.service.ucloud.cn/ucloudcli/ucloud-cli:0.1.22
 ```
 
 The docker image was built by the Dockerfile as follow.
 ```
 FROM ubuntu:18.04
 RUN apt-get update && apt-get install wget -y
-RUN wget https://github.com/ucloud/ucloud-cli/releases/download/0.1.20/ucloud-cli-linux-0.1.20-amd64.tgz
-RUN tar -zxf ucloud-cli-linux-0.1.20-amd64.tgz -C /usr/local/bin/
+RUN wget https://github.com/ucloud/ucloud-cli/releases/download/0.1.22/ucloud-cli-linux-0.1.22-amd64.tgz
+RUN tar -zxf ucloud-cli-linux-0.1.22-amd64.tgz -C /usr/local/bin/
 RUN echo "complete -C $(which ucloud) ucloud" >> ~/.bashrc #enable auto completion
 ```
 
 Create a docker container named ucloud-cli using the docker image your have pulled by following command.
 
 ```
-docker run --name ucloud-cli -it -d uhub.service.ucloud.cn/ucloudcli/ucloud-cli:0.1.20
+docker run --name ucloud-cli -it -d uhub.service.ucloud.cn/ucloudcli/ucloud-cli:0.1.22
 ```
 Run bash command in ucloud-cli container, and then you could play with ucloud cli.
 
@@ -175,7 +183,7 @@ $ ucloud uhost create --help
 Secondly, we're going to allocate an EIP and then bind it to the uhost created above.
 
 ```
-$ ucloud eip allocate --line International --bandwidth 1
+$ ucloud eip allocate --line International --bandwidth-mb 1
 allocate EIP[eip-xxx] IP:106.75.xx.xx  Line:BGP
 
 $ ucloud eip bind --eip-id eip-xxx --resource-id uhost-xxx

base/client.go

@@ -16,8 +16,9 @@ import (
 	"github.com/ucloud/ucloud-sdk-go/services/unet"
 	"github.com/ucloud/ucloud-sdk-go/services/uphost"
 	"github.com/ucloud/ucloud-sdk-go/services/vpc"
-	"github.com/ucloud/ucloud-sdk-go/ucloud"
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
 	"github.com/ucloud/ucloud-sdk-go/ucloud/auth"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/request"
 )
 
 //PrivateUHostClient 私有模块的uhost client 即未在官网开放的接口
@@ -52,22 +53,60 @@ type Client struct {
 }
 
 // NewClient will return a aggregate client
-func NewClient(config *ucloud.Config, credential *auth.Credential) *Client {
+func NewClient(config *sdk.Config, credential *auth.Credential) *Client {
+	var handler sdk.RequestHandler = func(c *sdk.Client, req request.Common) (request.Common, error) {
+		err := req.SetProjectId(PickResourceID(req.GetProjectId()))
+		return req, err
+	}
+	var (
+		uaccountClient = *uaccount.NewClient(config, credential)
+		uhostClient    = *uhost.NewClient(config, credential)
+		unetClient     = *unet.NewClient(config, credential)
+		vpcClient      = *vpc.NewClient(config, credential)
+		udpnClient     = *udpn.NewClient(config, credential)
+		pathxClient    = *pathx.NewClient(config, credential)
+		udiskClient    = *udisk.NewClient(config, credential)
+		ulbClient      = *ulb.NewClient(config, credential)
+		udbClient      = *udb.NewClient(config, credential)
+		umemClient     = *umem.NewClient(config, credential)
+		uphostClient   = *uphost.NewClient(config, credential)
+		puhostClient   = *puhost.NewClient(config, credential)
+		pudbClient     = *pudb.NewClient(config, credential)
+		pumemClient    = *pumem.NewClient(config, credential)
+		ppathxClient   = *ppathx.NewClient(config, credential)
+	)
+
+	uaccountClient.Client.AddRequestHandler(handler)
+	uhostClient.Client.AddRequestHandler(handler)
+	unetClient.Client.AddRequestHandler(handler)
+	vpcClient.Client.AddRequestHandler(handler)
+	udpnClient.Client.AddRequestHandler(handler)
+	pathxClient.Client.AddRequestHandler(handler)
+	udiskClient.Client.AddRequestHandler(handler)
+	ulbClient.Client.AddRequestHandler(handler)
+	udbClient.Client.AddRequestHandler(handler)
+	umemClient.Client.AddRequestHandler(handler)
+	uphostClient.Client.AddRequestHandler(handler)
+	puhostClient.Client.AddRequestHandler(handler)
+	pudbClient.Client.AddRequestHandler(handler)
+	pumemClient.Client.AddRequestHandler(handler)
+	ppathxClient.Client.AddRequestHandler(handler)
+
 	return &Client{
-		*uaccount.NewClient(config, credential),
-		*uhost.NewClient(config, credential),
-		*unet.NewClient(config, credential),
-		*vpc.NewClient(config, credential),
-		*udpn.NewClient(config, credential),
-		*pathx.NewClient(config, credential),
-		*udisk.NewClient(config, credential),
-		*ulb.NewClient(config, credential),
-		*udb.NewClient(config, credential),
-		*umem.NewClient(config, credential),
-		*uphost.NewClient(config, credential),
-		*puhost.NewClient(config, credential),
-		*pudb.NewClient(config, credential),
-		*pumem.NewClient(config, credential),
-		*ppathx.NewClient(config, credential),
+		uaccountClient,
+		uhostClient,
+		unetClient,
+		vpcClient,
+		udpnClient,
+		pathxClient,
+		udiskClient,
+		ulbClient,
+		udbClient,
+		umemClient,
+		uphostClient,
+		puhostClient,
+		pudbClient,
+		pumemClient,
+		ppathxClient,
 	}
 }

base/config.go

@@ -530,7 +530,6 @@ func GetBizClient(ac *AggConfig) (*Client, error) {
 		UserAgent:  fmt.Sprintf("UCloud-CLI/%s", Version),
 		LogLevel:   log.FatalLevel,
 		Region:     ac.Region,
-		Zone:       ac.Zone,
 		ProjectId:  ac.ProjectID,
 		MaxRetries: *ac.MaxRetryTimes,
 	}

base/log.go

@@ -122,7 +122,6 @@ func (hook *LogRotateHook) Fire(entry *log.Entry) error {
 		return err
 	}
 	entry.Logger.SetOutput(mfile)
-	initLog()
 	return nil
 }
 

cmd/bandwidth.go

@@ -80,8 +80,8 @@ func NewCmdSharedBWCreate() *cobra.Command {
 	flags.SortFlags = false
 	req.Name = flags.String("name", "", "Required. Name of the shared bandwidth instance")
 	req.ShareBandwidth = flags.Int("bandwidth-mb", 20, "Optional. Unit:Mb. Bandwidth of the shared bandwidth. Range [20,5000]")
-	req.Region = flags.String("region", base.ConfigIns.Region, "Optional. Region, see 'ucloud region'")
-	req.ProjectId = flags.String("project-id", base.ConfigIns.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
 	req.ChargeType = flags.String("charge-type", "Month", "Optional.'Year',pay yearly;'Month',pay monthly;'Dynamic', pay hourly")
 	req.Quantity = flags.Int("quantity", 1, "Optional. The duration of the instance. N years/months.")
 	flags.SetFlagValues("charge-type", "Month", "Year", "Dynamic")
@@ -140,8 +140,8 @@ func NewCmdSharedBWList(out io.Writer) *cobra.Command {
 	flags := cmd.Flags()
 	flags.SortFlags = false
 
-	req.Region = flags.String("region", base.ConfigIns.Region, "Optional. Region, see 'ucloud region'")
-	req.ProjectId = flags.String("project-id", base.ConfigIns.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
 	flags.StringSliceVar(&req.ShareBandwidthIds, "shared-bw-id", nil, "Resource ID of shared bandwidth instances to list")
 
 	return cmd
@@ -174,8 +174,8 @@ func NewCmdSharedBWResize() *cobra.Command {
 
 	req.ShareBandwidthId = flags.String("shared-bw-id", "", "Required. Resource ID of shared bandwidth instance to resize")
 	req.ShareBandwidth = flags.Int("bandwidth-mb", 0, "Required. Unit:Mb. resize to bandwidth value")
-	req.Region = flags.String("region", base.ConfigIns.Region, "Optional. Region, see 'ucloud region'")
-	req.ProjectId = flags.String("project-id", base.ConfigIns.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
 
 	flags.SetFlagValuesFunc("shared-bw-id", func() []string {
 		list, _ := getAllSharedBW(*req.ProjectId, *req.Region)
@@ -214,8 +214,8 @@ func NewCmdSharedBWDelete() *cobra.Command {
 	flags.StringSliceVar(&ids, "shared-bw-id", nil, "Required. Resource ID of shared bandwidth instances to delete")
 	req.EIPBandwidth = flags.Int("eip-bandwidth-mb", 1, "Optional. Bandwidth of the joined EIPs,after deleting the shared bandwidth instance")
 	req.PayMode = flags.String("traffic-mode", "", "Optional. The charge mode of joined EIPs after deleting the shared bandwidth. Accept values:Bandwidth,Traffic")
-	req.Region = flags.String("region", base.ConfigIns.Region, "Optional. Region, see 'ucloud region'")
-	req.ProjectId = flags.String("project-id", base.ConfigIns.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
 	flags.SetFlagValuesFunc("shared-bw-id", func() []string {
 		list, _ := getAllSharedBW(*req.ProjectId, *req.Region)
 		return list
@@ -309,8 +309,8 @@ func NewCmdBandwidthPkgCreate() *cobra.Command {
 	start = flags.String("start-time", "", "Required. The time to enable bandwidth package. Local time, for example '2018-12-25/08:30:00'")
 	end = flags.String("end-time", "", "Required. The time to disable bandwidth package. Local time, for example '2018-12-26/08:30:00'")
 	req.Bandwidth = flags.Int("bandwidth-mb", 0, "Required. bandwidth of the bandwidth package to create.Range [1,800]. Unit:'Mb'.")
-	req.Region = flags.String("region", base.ConfigIns.Region, "Optional. Region, see 'ucloud region'")
-	req.ProjectId = flags.String("project-id", base.ConfigIns.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
 
 	cmd.Flags().SetFlagValuesFunc("eip-id", func() []string {
 		return getAllEip(*req.ProjectId, *req.Region, []string{status.EIP_USED}, []string{status.EIP_CHARGE_BANDWIDTH})
@@ -365,8 +365,8 @@ func NewCmdBandwidthPkgList(out io.Writer) *cobra.Command {
 	}
 	flags := cmd.Flags()
 	flags.SortFlags = false
-	req.Region = flags.String("region", base.ConfigIns.Region, "Optional. Region, see 'ucloud region'")
-	req.ProjectId = flags.String("project-id", base.ConfigIns.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
 	req.Offset = cmd.Flags().Int("offset", 0, "Optional. Offset")
 	req.Limit = cmd.Flags().Int("limit", 50, "Optional. Limit range [0,10000000]")
 
@@ -398,8 +398,8 @@ func NewCmdBandwidthPkgDelete() *cobra.Command {
 	flags := cmd.Flags()
 	flags.SortFlags = false
 	flags.StringSliceVar(&ids, "resource-id", nil, "Required, Resource ID of bandwidth package to delete")
-	req.Region = flags.String("region", base.ConfigIns.Region, "Optional. Region, see 'ucloud region'")
-	req.ProjectId = flags.String("project-id", base.ConfigIns.ProjectID, "Optional. Project-id, see 'ucloud project list'")
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
 
 	return cmd
 }

cmd/eip.go

@@ -68,15 +68,16 @@ type EIPRow struct {
 //NewCmdEIPList ucloud eip list
 func NewCmdEIPList(out io.Writer) *cobra.Command {
 	req := base.BizClient.NewDescribeEIPRequest()
-	fetchAll := sdk.Bool(false)
+	fetchAll := false
+	pageOff := false
 	cmd := &cobra.Command{
 		Use:     "list",
 		Short:   "List all EIP instances",
 		Long:    `List all EIP instances`,
 		Example: "ucloud eip list",
 		Run: func(cmd *cobra.Command, args []string) {
 			var eipList []unet.UnetEIPSet
-			if *fetchAll == true {
+			if fetchAll || pageOff {
 				list, err := fetchAllEip(*req.ProjectId, *req.Region)
 				if err != nil {
 					base.HandleError(err)
@@ -114,12 +115,15 @@ func NewCmdEIPList(out io.Writer) *cobra.Command {
 		},
 	}
 
-	req.ProjectId = cmd.Flags().String("project-id", base.ConfigIns.ProjectID, "Assign project-id")
-	req.Region = cmd.Flags().String("region", base.ConfigIns.Region, "Assign region")
-	req.Offset = cmd.Flags().Int("offset", 0, "Optional. Offset default 0")
-	req.Limit = cmd.Flags().Int("limit", 50, "Optional. Limit default 50, max value 100")
-	fetchAll = cmd.Flags().Bool("list-all", false, "List all eip")
-	cmd.Flags().SetFlagValues("list-all", "true", "false")
+	flags := cmd.Flags()
+	bindRegion(req, flags)
+	bindProjectID(req, flags)
+	req.Offset = flags.Int("offset", 0, "Optional. Offset default 0")
+	req.Limit = flags.Int("limit", 50, "Optional. Limit default 50, max value 100")
+	flags.BoolVar(&fetchAll, "list-all", false, "List all eip")
+	flags.BoolVar(&pageOff, "page-off", false, "Optional. Paging or not. Accept values: true or false")
+	flags.SetFlagValues("list-all", "true", "false")
+	flags.MarkDeprecated("list-all", "please use '--page-off' instead")
 
 	return cmd
 }
@@ -226,29 +230,29 @@ func NewCmdEIPAllocate() *cobra.Command {
 		Long:    "Allocate EIP",
 		Example: "ucloud eip allocate --line BGP --bandwidth-mb 2",
 		Run: func(cmd *cobra.Command, args []string) {
-			if *req.OperatorName == "BGP" {
-				*req.OperatorName = "Bgp"
+			if *req.OperatorName == "" {
+				*req.OperatorName = getEIPLine(*req.Region)
 			}
 			for i := 0; i < *count; i++ {
 				resp, err := base.BizClient.AllocateEIP(req)
 				if err != nil {
 					base.HandleError(err)
-				} else {
-					for _, eip := range resp.EIPSet {
-						base.Cxt.Printf("allocate EIP[%s] ", eip.EIPId)
-						for _, ip := range eip.EIPAddr {
-							base.Cxt.Printf("IP:%s  Line:%s \n", ip.IP, ip.OperatorName)
-						}
+					continue
+				}
+				for _, eip := range resp.EIPSet {
+					base.Cxt.Printf("allocate EIP[%s] ", eip.EIPId)
+					for _, ip := range eip.EIPAddr {
+						base.Cxt.Printf("IP:%s  Line:%s \n", ip.IP, ip.OperatorName)
 					}
 				}
 			}
 		},
 	}
 	cmd.Flags().SortFlags = false
-	req.OperatorName = cmd.Flags().String("line", "", "Required. 'BGP' or 'International'. 'BGP' could be set in China mainland regions, such as cn-bj2 etc. 'International' could be set in the regions beyond mainland, such as hk, tw-kh, us-ws etc.")
 	req.Bandwidth = cmd.Flags().Int("bandwidth-mb", 0, "Required. Bandwidth(Unit:Mbps).The range of value related to network charge mode. By traffic [1, 200]; by bandwidth [1,800] (Unit: Mbps); it could be 0 if the eip belong to the shared bandwidth")
-	req.ProjectId = cmd.Flags().String("project-id", base.ConfigIns.ProjectID, "Optional. Assign project-id")
-	req.Region = cmd.Flags().String("region", base.ConfigIns.Region, "Optional. Assign region")
+	req.OperatorName = cmd.Flags().String("line", "", "Optional. 'BGP' or 'International'. 'BGP' could be set in China mainland regions, such as cn-bj2 etc. 'International' could be set in the regions beyond mainland, such as hk, tw-kh, us-ws etc.")
+	bindProjectID(req, cmd.Flags())
+	bindRegion(req, cmd.Flags())
 	req.PayMode = cmd.Flags().String("traffic-mode", "Bandwidth", "Optional. traffic-mode is an enumeration value. 'Traffic','Bandwidth' or 'ShareBandwidth'")
 	req.ShareBandwidthId = cmd.Flags().String("share-bandwidth-id", "", "Optional. ShareBandwidthId, required only when traffic-mode is 'ShareBandwidth'")
 	req.Quantity = cmd.Flags().Int("quantity", 1, "Optional. The duration of the instance. N years/months.")
@@ -261,7 +265,6 @@ func NewCmdEIPAllocate() *cobra.Command {
 	cmd.Flags().SetFlagValues("line", "BGP", "International")
 	cmd.Flags().SetFlagValues("traffic-mode", "Bandwidth", "Traffic", "ShareBandwidth")
 	cmd.Flags().SetFlagValues("charge-type", "Month", "Year", "Dynamic", "Trial")
-	cmd.MarkFlagRequired("line")
 	cmd.MarkFlagRequired("bandwidth-mb")
 	return cmd
 }