update ucloud-sdk-go to 0.4.0

Author: lixiaojun629

cmd/completion.go

@@ -59,9 +59,9 @@ func NewCmdCompletion() *cobra.Command {
 			shell, ok := os.LookupEnv("SHELL")
 			if ok {
 				if strings.HasSuffix(shell, "bash") {
-					bashCompletion(cmd.Parent())
+					bashCompletion(cmd)
 				} else if strings.HasSuffix(shell, "zsh") {
-					zshCompletion(cmd.Parent())
+					zshCompletion(cmd)
 				} else {
 					fmt.Println("Unknow shell: %", shell)
 				}

cmd/configure.go

@@ -116,7 +116,7 @@ func NewCmdConfig() *cobra.Command {
 //NewCmdConfigList ucloud config ls
 func NewCmdConfigList() *cobra.Command {
 	var configListCmd = &cobra.Command{
-		Use:   "ls",
+		Use:   "list",
 		Short: "list all settings",
 		Long:  `list all settings`,
 		Run: func(cmd *cobra.Command, args []string) {

cmd/eip.go

@@ -46,7 +46,6 @@ func NewCmdEIPList() *cobra.Command {
 		Long:    `List all EIP instances`,
 		Example: "ucloud eip ls",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(req)
 			resp, err := BizClient.DescribeEIP(req)
 			if err != nil {
 				fmt.Println("Error:", err)
@@ -65,6 +64,8 @@ func NewCmdEIPList() *cobra.Command {
 			}
 		},
 	}
+	cmd.Flags().StringVar(&req.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	cmd.Flags().StringVar(&req.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	return cmd
 }
 
@@ -77,7 +78,6 @@ func NewCmdEIPAllocate() *cobra.Command {
 		Long:    "Allocate EIP",
 		Example: "ucloud eip allocate --line Bgp --bandwidth 2",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(eipAllocateReq)
 			resp, err := BizClient.AllocateEIP(eipAllocateReq)
 			if err != nil {
 				fmt.Println(err)
@@ -96,6 +96,8 @@ func NewCmdEIPAllocate() *cobra.Command {
 		},
 	}
 	cmd.Flags().SortFlags = false
+	cmd.Flags().StringVar(&eipAllocateReq.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	cmd.Flags().StringVar(&eipAllocateReq.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	cmd.Flags().StringVar(&eipAllocateReq.OperatorName, "line", "", "Line 'Bgp' or 'International'. 'Bgp' can be set in region cn-sh1,cn-sh2,cn-gd,cn-bj1 and cn-bj2. 'International' can be set in region hk,us-ca,th-bkk,kr-seoul,us-ws,ge-fra,sg,tw-kh and other oversea regions. Required")
 	cmd.Flags().IntVar(&eipAllocateReq.Bandwidth, "bandwidth", 0, "Bandwidth(Unit:Mbps). When paying by traffic, it ranges from 1 to 200; when paying by bandwidth, it ranges from 1 to 800, and when shared bandwidth is used, its value is 0. Required")
 	cmd.Flags().StringVar(&eipAllocateReq.PayMode, "pay-mode", "Bandwidth", "pay-mode is an enumeration value. 'Traffic','Bandwidth' or 'ShareBandwidth'")
@@ -119,7 +121,6 @@ func NewCmdEIPBind() *cobra.Command {
 		Long:    "Bind EIP with uhost",
 		Example: "ucloud eip bind --eip-id eip-xxx --resource-id uhost-xxx",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(eipBindReq)
 			eipBindReq.ResourceType = "uhost"
 			resp, err := BizClient.BindEIP(eipBindReq)
 			if err != nil {
@@ -134,6 +135,8 @@ func NewCmdEIPBind() *cobra.Command {
 		},
 	}
 	eipBindCmd.Flags().SortFlags = false
+	eipBindCmd.Flags().StringVar(&eipBindReq.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	eipBindCmd.Flags().StringVar(&eipBindReq.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	eipBindCmd.Flags().StringVar(&eipBindReq.EIPId, "eip-id", "", "EIPId to bind. Required")
 	eipBindCmd.Flags().StringVar(&eipBindReq.ResourceId, "resource-id", "", "ResourceID , which is the UHostId of uhost. Required")
 	eipBindCmd.MarkFlagRequired("eip-id")
@@ -151,7 +154,6 @@ func NewCmdEIPUnbind() *cobra.Command {
 		Long:    "Unbind EIP with uhost",
 		Example: "ucloud eip unbind --eip-id eip-xxx --resource-id uhost-xxx",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(eipUnBindReq)
 			eipUnBindReq.ResourceType = "uhost"
 			resp, err := BizClient.UnBindEIP(eipUnBindReq)
 			if err != nil {
@@ -166,6 +168,8 @@ func NewCmdEIPUnbind() *cobra.Command {
 		},
 	}
 	eipUnBindCmd.Flags().SortFlags = false
+	eipUnBindCmd.Flags().StringVar(&eipUnBindReq.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	eipUnBindCmd.Flags().StringVar(&eipUnBindReq.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	eipUnBindCmd.Flags().StringVar(&eipUnBindReq.EIPId, "eip-id", "", "EIPId to unbind. Required")
 	eipUnBindCmd.Flags().StringVar(&eipUnBindReq.ResourceId, "resource-id", "", "ResourceID , which is the UHostId of uhost. Required")
 	eipUnBindCmd.MarkFlagRequired("eip-id")
@@ -177,15 +181,14 @@ func NewCmdEIPUnbind() *cobra.Command {
 //NewCmdEIPRelease ucloud eip release
 func NewCmdEIPRelease() *cobra.Command {
 	var ids []string
+	var eipReleaseReq = BizClient.NewReleaseEIPRequest()
 	var eipReleaseCmd = &cobra.Command{
 		Use:     "release",
 		Short:   "Release EIP",
 		Long:    "Release EIP",
 		Example: "ucloud eip release --eip-id eip-xx1 --eip-id eip-xx2",
 		Run: func(cmd *cobra.Command, args []string) {
 			for _, id := range ids {
-				var eipReleaseReq = BizClient.NewReleaseEIPRequest()
-				bindGlobalParam(eipReleaseReq)
 				eipReleaseReq.EIPId = id
 				resp, err := BizClient.ReleaseEIP(eipReleaseReq)
 				if err != nil {
@@ -194,12 +197,14 @@ func NewCmdEIPRelease() *cobra.Command {
 					if resp.RetCode == 0 {
 						fmt.Printf("EIP: %v released \n", eipReleaseReq.EIPId)
 					} else {
-						fmt.Printf("Something wrong. RetCode:%d, Message: %s \n", resp.RetCode, resp.Message)
+						HandleBizError(resp)
 					}
 				}
 			}
 		},
 	}
+	eipReleaseCmd.Flags().StringVar(&eipReleaseReq.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	eipReleaseCmd.Flags().StringVar(&eipReleaseReq.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	eipReleaseCmd.Flags().StringArrayVarP(&ids, "eip-id", "", make([]string, 0), "EIPId of the EIP you want to release. Required")
 	eipReleaseCmd.MarkFlagRequired("eip-id")
 	eipReleaseCmd.MarkFlagRequired("bandwidth")

cmd/globalssh.go

@@ -40,12 +40,11 @@ func NewCmdGssh() *cobra.Command {
 func NewCmdGsshList() *cobra.Command {
 	req := BizClient.NewDescribeGlobalSSHInstanceRequest()
 	var cmd = &cobra.Command{
-		Use:     "ls",
+		Use:     "list",
 		Short:   "List all GlobalSSH instances",
 		Long:    `List all GlobalSSH instances`,
 		Example: "ucloud gssh ls",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(req)
 			resp, err := BizClient.DescribeGlobalSSHInstance(req)
 			if err != nil {
 				fmt.Println("Error", err)
@@ -60,6 +59,8 @@ func NewCmdGsshList() *cobra.Command {
 			}
 		},
 	}
+	cmd.Flags().StringVar(&req.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	cmd.Flags().StringVar(&req.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	return cmd
 }
 
@@ -72,7 +73,6 @@ func NewCmdGsshCreate() *cobra.Command {
 		Long:    "Create GlobalSSH instance",
 		Example: "ucloud gssh create --area Washington --target-ip 8.8.8.8",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(gsshCreateReq)
 			var areaMap = map[string]string{
 				"LosAngeles": "洛杉矶",
 				"Singapore":  "新加坡",
@@ -111,6 +111,8 @@ func NewCmdGsshCreate() *cobra.Command {
 		},
 	}
 	cmd.Flags().SortFlags = false
+	cmd.Flags().StringVar(&gsshCreateReq.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	cmd.Flags().StringVar(&gsshCreateReq.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	cmd.Flags().StringVar(&gsshCreateReq.Area, "area", "", "Location of the source server.Only supports six cities,LosAngeles,Singapore,HongKong,Tokyo,Washington,Frankfurt. Required")
 	cmd.Flags().StringVar(&gsshCreateReq.TargetIP, "target-ip", "", "IP of the source server. Required")
 	cmd.Flags().StringVar(&gsshCreateReq.Port, "port", "22", "Port of The SSH service between 1 and 65535. Do not use ports such as 80,443.")
@@ -131,13 +133,8 @@ func NewCmdGsshDelete() *cobra.Command {
 		Long:    "Delete GlobalSSH instance",
 		Example: "ucloud gssh delete --id uga-xx1  --id uga-xx2",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(gsshDeleteReq)
 			for _, id := range gsshIds {
 				gsshDeleteReq.InstanceId = id
-
-				// if global.projectID != "" {
-				// 	gsshDeleteReq.ProjectId = global.projectID
-				// }
 				resp, err := BizClient.DeleteGlobalSSHInstance(gsshDeleteReq)
 				if err != nil {
 					fmt.Println("Error:", err)
@@ -151,6 +148,8 @@ func NewCmdGsshDelete() *cobra.Command {
 			}
 		},
 	}
+	cmd.Flags().StringVar(&gsshDeleteReq.Region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	cmd.Flags().StringVar(&gsshDeleteReq.ProjectId, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	cmd.Flags().StringArrayVar(&gsshIds, "id", make([]string, 0), "ID of the GlobalSSH instances you want to delete. Multiple values specified by multiple flags. Required")
 	cmd.MarkFlagRequired("id")
 	return cmd
@@ -160,14 +159,18 @@ func NewCmdGsshDelete() *cobra.Command {
 func NewCmdGsshModify() *cobra.Command {
 	var gsshModifyPortReq = BizClient.NewModifyGlobalSSHPortRequest()
 	var gsshModifyRemarkReq = BizClient.NewModifyGlobalSSHRemarkRequest()
+	var region, project string
 	var cmd = &cobra.Command{
-		Use:     "modify",
-		Short:   "Modify GlobalSSH instance",
-		Long:    "Modify GlobalSSH instance, including port and remark attribute",
+		Use:     "update",
+		Short:   "Update GlobalSSH instance",
+		Long:    "Update GlobalSSH instance, including port and remark attribute",
 		Example: "ucloud gssh modify --id uga-xxx --port 22",
 		Run: func(cmd *cobra.Command, args []string) {
-			bindGlobalParam(gsshModifyPortReq)
-			bindGlobalParam(gsshModifyRemarkReq)
+			gsshModifyPortReq.Region = region
+			gsshModifyPortReq.ProjectId = project
+			gsshModifyRemarkReq.Region = region
+			gsshModifyRemarkReq.ProjectId = project
+
 			if gsshModifyPortReq.Port == "" && gsshModifyRemarkReq.Remark == "" {
 				fmt.Println("port or remark required")
 			}
@@ -207,6 +210,8 @@ func NewCmdGsshModify() *cobra.Command {
 			}
 		},
 	}
+	cmd.Flags().StringVar(&region, "region", ConfigInstance.Region, "Assign region(override default region of your config)")
+	cmd.Flags().StringVar(&project, "project-id", ConfigInstance.ProjectID, "Assign project-id(override default projec-id of your config)")
 	cmd.Flags().StringVar(&gsshModifyPortReq.Port, "port", "", "Port of SSH service.")
 	cmd.Flags().StringVar(&gsshModifyRemarkReq.Remark, "remark", "", "Remark of your GlobalSSH.")
 	cmd.Flags().StringVar(&gsshModifyRemarkReq.InstanceId, "id", "", "InstanceID of your GlobalSSH. Required")

cmd/list.go cmd/region.gocmd/list.go renamed to cmd/region.go

@@ -18,6 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -27,31 +28,19 @@ import (
 	. "github.com/ucloud/ucloud-cli/util"
 )
 
-//NewCmdList ucloud ls
-func NewCmdList() *cobra.Command {
-	var listObject string
+//NewCmdRegion ucloud ls
+func NewCmdRegion() *cobra.Command {
 	var cmd = &cobra.Command{
-		Use:     "ls",
-		Short:   "List all regions or projects",
-		Long:    "List all regions or projects",
-		Example: "ucloud ls --object region; ucloud ls --object project",
+		Use:     "region",
+		Short:   "List all region and zone",
+		Long:    "List all region and zone",
+		Example: "ucloud region",
 		Run: func(cmd *cobra.Command, args []string) {
-			switch listObject {
-			case "region":
-				if err := listRegion(); err != nil {
-					fmt.Println(err)
-				}
-			case "project":
-				if err := listProject(); err != nil {
-					fmt.Println(err)
-				}
-			default:
-				fmt.Println("object should be region or project")
+			if err := listRegion(); err != nil {
+				Tracer.Println(err)
 			}
 		},
 	}
-	cmd.Flags().StringVar(&listObject, "object", "", "Object to list,region or project. Required")
-	cmd.MarkFlagRequired("object")
 	return cmd
 }
 
@@ -72,6 +61,12 @@ func getDefaultRegion() (string, error) {
 	return "", fmt.Errorf("No default region")
 }
 
+//RegionTable 为显示region表格创建的类型
+type RegionTable struct {
+	Region string
+	Zones  string
+}
+
 func listRegion() error {
 	req := &uaccount.GetRegionRequest{}
 	resp, err := BizClient.GetRegion(req)
@@ -80,19 +75,22 @@ func listRegion() error {
 	}
 	if resp.RetCode != 0 {
 		return fmt.Errorf("Something wrong. RetCode:%d, Message:%s", resp.RetCode, resp.Message)
-	}
-	var regionMap = map[string]bool{}
-	var regionList []string
-	for _, region := range resp.Regions {
-		if _, ok := regionMap[region.Region]; !ok {
-			regionList = append(regionList, region.Region)
+	} else {
+		regionList := make([]RegionTable, 0)
+		regionMap := make(map[string][]string)
+		for _, region := range resp.Regions {
+			regionMap[region.Region] = append(regionMap[region.Region], region.Zone)
+		}
+		for region, zones := range regionMap {
+			regionList = append(regionList, RegionTable{region, strings.Join(zones, ", ")})
+		}
+		if global.json {
+			PrintJSON(regionList)
+		} else {
+			err = PrintTable(regionList, []string{"Region", "Zones"})
 		}
-		regionMap[region.Region] = true
-	}
-	for index, region := range regionList {
-		fmt.Printf("[%2d] %s\n", index, region)
 	}
-	return nil
+	return err
 }
 
 func getDefaultProject() (string, error) {

cmd/root.go

@@ -20,17 +20,22 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk/request"
-
 	"github.com/ucloud/ucloud-cli/model"
 	. "github.com/ucloud/ucloud-cli/util"
 )
 
 //GlobalFlag 几乎所有接口都需要的参数，例如 region zone projectID
 type GlobalFlag struct {
-	debug bool
+	debug      bool
+	json       bool
+	version    bool
+	completion bool
+	config     bool
+	signup     bool
 }
 
+const version = "0.1.2"
+
 var global GlobalFlag
 
 //NewCmdRoot 创建rootCmd rootCmd represents the base command when called without any subcommands
@@ -40,20 +45,33 @@ func NewCmdRoot() *cobra.Command {
 		Short:                  "UCloud CLI v" + version,
 		Long:                   `UCloud CLI - manage UCloud resources and developer workflow`,
 		BashCompletionFunction: "__ucloud_init_completion",
+		Run: func(cmd *cobra.Command, args []string) {
+			if global.version {
+				Tracer.Printf("ucloud cli %s\n", version)
+			} else if global.completion {
+				NewCmdCompletion().Run(cmd, args)
+			} else if global.config {
+				config.ListConfig()
+			} else if global.signup {
+				NewCmdSignup().Run(cmd, args)
+			} else {
+				cmd.HelpFunc()(cmd, args)
+			}
+		},
 	}
 
-	// cmd.PersistentFlags().StringVarP(&global.region, "region", "r", "", "Assign region(override default region of your config)")
-	// cmd.PersistentFlags().StringVarP(&global.projectID, "project-id", "p", "", "Assign project-id(override default projec-id of your config)")
 	cmd.PersistentFlags().BoolVarP(&global.debug, "debug", "d", false, "Running in debug mode")
+	cmd.PersistentFlags().BoolVarP(&global.json, "json", "j", false, "Print result in JSON format whenever possible")
+	cmd.Flags().BoolVar(&global.version, "version", false, "Display version")
+	cmd.Flags().BoolVar(&global.completion, "completion", false, "Create or update completion scripts")
+	cmd.Flags().BoolVar(&global.config, "config", false, "Display configuration")
+	cmd.Flags().BoolVar(&global.signup, "signup", false, "Launch UCloud sign up page in browser")
 
-	cmd.AddCommand(NewCmdSignup())
 	cmd.AddCommand(NewCmdConfig())
-	cmd.AddCommand(NewCmdList())
+	cmd.AddCommand(NewCmdRegion())
 	cmd.AddCommand(NewCmdUHost())
 	cmd.AddCommand(NewCmdEIP())
 	cmd.AddCommand(NewCmdGssh())
-	cmd.AddCommand(NewCmdCompletion())
-	cmd.AddCommand(NewCmdVersion())
 
 	return cmd
 }
@@ -102,12 +120,3 @@ func initialize(cmd *cobra.Command) {
 		}
 	}
 }
-
-func bindGlobalParam(req request.Common) {
-	// if global.region != "" {
-	// 	req.SetRegion(global.region)
-	// }
-	// if global.projectID != "" {
-	// 	req.SetProjectId(global.projectID)
-	// }
-}