Merge pull request #6 from lixiaojun629/develop

0.1.4

Author: lixiaojun629

Makefile

@@ -1,4 +1,4 @@
-export VERSION=0.1.3
+export VERSION=0.1.4
 
 .PHONY : build
 build: 

README.md

@@ -33,7 +33,7 @@ $ brew update
 For windows users, suggest build from the source code which require install Golang first. This also works for Linux and macOS.
 
 ```
-$ mkdir -p $ GOPATH/src/github.com/ucloud
+$ mkdir -p $GOPATH/src/github.com/ucloud
 $ cd $GOPATH/src/github.com/ucloud
 $ git clone https://github.com/ucloud/ucloud-cli.git
 $ cd ucloud-cli
@@ -80,5 +80,5 @@ $ ucloud help
 Taking configure globalssh to uhost instance as an example, which will acceleare the instance SSH management efficiency (TCP 22 as default):
 
 ```
-$ ucloud gssh create --area Washington --target-ip 128.14.225.161
+$ ucloud gssh create --location Washington --target-ip 128.14.225.161
 ```

ansi/code.go

@@ -0,0 +1,18 @@
+// Reference https://github.com/sindresorhus/ansi-escapes
+package ansi
+
+import (
+	"fmt"
+)
+
+const ESC = "\x1b["
+const OSC = "\x1b]"
+const BEL = "\x07"
+const SEP = ";"
+
+var CursorLeft = fmt.Sprintf("%sG", ESC)
+var EraseDown = fmt.Sprintf("%sJ", ESC)
+
+func CursorUp(count int) string {
+	return fmt.Sprintf("%s%dA", ESC, count)
+}

…/ucloud/ucloud-sdk-go/services/client.go base/client.govendor/github.com/ucloud/ucloud-sdk-go/services/client.go renamed to base/client.go vendor/github.com/ucloud/ucloud-sdk-go/services/client.go renamed to base/client.go

@@ -1,43 +1,34 @@
-package services
+package base
 
 import (
-	"github.com/ucloud/ucloud-sdk-go/sdk"
-	"github.com/ucloud/ucloud-sdk-go/sdk/auth"
 	"github.com/ucloud/ucloud-sdk-go/services/pathx"
 	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 	"github.com/ucloud/ucloud-sdk-go/services/ulb"
 	"github.com/ucloud/ucloud-sdk-go/services/unet"
 	"github.com/ucloud/ucloud-sdk-go/services/vpc"
+	"github.com/ucloud/ucloud-sdk-go/ucloud"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/auth"
 )
 
+//Client aggregate client for business
 type Client struct {
 	uaccount.UAccountClient
-
 	uhost.UHostClient
-
 	unet.UNetClient
-
 	ulb.ULBClient
-
 	vpc.VPCClient
-
 	pathx.PathXClient
 }
 
 // NewClient will return a aggregate client
-func NewClient(config *sdk.Config, credential *auth.Credential) *Client {
+func NewClient(config *ucloud.Config, credential *auth.Credential) *Client {
 	return &Client{
 		*uaccount.NewClient(config, credential),
-
 		*uhost.NewClient(config, credential),
-
 		*unet.NewClient(config, credential),
-
 		*ulb.NewClient(config, credential),
-
 		*vpc.NewClient(config, credential),
-
 		*pathx.NewClient(config, credential),
 	}
 }

util/config.go base/config.goutil/config.go renamed to base/config.go

@@ -1,4 +1,4 @@
-package util
+package base
 
 import (
 	"encoding/json"
@@ -8,16 +8,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk"
-	"github.com/ucloud/ucloud-sdk-go/sdk/auth"
-	service "github.com/ucloud/ucloud-sdk-go/services"
 	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/auth"
 )
 
 const configFile = "config.json"
 
 //Version 版本号
-const Version = "0.1.3"
+const Version = "0.1.4"
 
 //ConfigPath 配置文件路径
 
@@ -130,7 +129,8 @@ func (p *Config) ListConfig(json bool) error {
 	if json {
 		return PrintJSON(tmpConfig)
 	}
-	return PrintTable([]Config{tmpConfig}, []string{"PublicKey", "PrivateKey", "Region", "Zone", "ProjectID"})
+	PrintTable([]Config{tmpConfig}, []string{"PublicKey", "PrivateKey", "Region", "Zone", "ProjectID"})
+	return nil
 }
 
 //ClearConfig 清空配置
@@ -203,5 +203,5 @@ func init() {
 	SdkClient = sdk.NewClient(ClientConfig, Credential)
 
 	//bizClient 用于调用业务接口
-	BizClient = service.NewClient(ClientConfig, Credential)
+	BizClient = NewClient(ClientConfig, Credential)
 }

util/cli.go base/util.goutil/cli.go renamed to base/util.go

@@ -1,4 +1,4 @@
-package util
+package base
 
 import (
 	"bufio"
@@ -13,10 +13,9 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk"
-	uerr "github.com/ucloud/ucloud-sdk-go/sdk/error"
-	"github.com/ucloud/ucloud-sdk-go/sdk/response"
-	service "github.com/ucloud/ucloud-sdk-go/services"
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+	uerr "github.com/ucloud/ucloud-sdk-go/ucloud/error"
+	"github.com/ucloud/ucloud-sdk-go/ucloud/response"
 
 	"github.com/ucloud/ucloud-cli/model"
 )
@@ -34,7 +33,7 @@ var Cxt = model.GetContext(os.Stdout)
 var SdkClient *sdk.Client
 
 //BizClient 用于调用业务接口
-var BizClient *service.Client
+var BizClient *Client
 
 //GetHomePath 获取家目录
 func GetHomePath() string {
@@ -136,24 +135,32 @@ func PrintJSON(dataSet interface{}) error {
 	return nil
 }
 
-//PrintTable 以表格方式打印数据集合
-func PrintTable(dataSet interface{}, fieldList []string) error {
+//PrintTableS 简化版表格打印，无需传表头，根据结构体反射解析
+func PrintTableS(dataSet interface{}) {
 	dataSetVal := reflect.ValueOf(dataSet)
+	fieldNameList := make([]string, 0)
+	if dataSetVal.Len() > 0 {
+		elemType := dataSetVal.Index(0).Type()
+		for i := 0; i < elemType.NumField(); i++ {
+			fieldNameList = append(fieldNameList, elemType.Field(i).Name)
+		}
+	}
+	if kind := dataSetVal.Kind(); kind == reflect.Slice || kind == reflect.Array {
+		displaySlice(dataSetVal, fieldNameList)
+	} else {
+		panic(fmt.Sprintf("Internal error, PrintTableS expect array or slice, accept %T", dataSet))
+	}
+}
 
+//PrintTable 以表格方式打印数据集合
+func PrintTable(dataSet interface{}, fieldList []string) {
+	dataSetVal := reflect.ValueOf(dataSet)
 	switch dataSetVal.Kind() {
 	case reflect.Slice, reflect.Array:
 		displaySlice(dataSetVal, fieldList)
-	case reflect.Map:
-		displayMap(dataSetVal, fieldList)
 	default:
-		return fmt.Errorf("PrintTable expect array,slice or map, accept %T", dataSet)
+		panic(fmt.Sprintf("PrintTable expect array,slice or map, accept %T", dataSet))
 	}
-	return nil
-}
-
-func displayMap(mapVal reflect.Value, fieldList []string) {
-	fmt.Println(mapVal, fieldList)
-	//todo
 }
 
 func displaySlice(listVal reflect.Value, fieldList []string) {
@@ -180,39 +187,42 @@ func displaySlice(listVal reflect.Value, fieldList []string) {
 		}
 		rowList = append(rowList, row)
 	}
+	printTable(rowList, fieldList, showFieldMap)
+}
 
+func printTable(rowList []map[string]interface{}, fieldList []string, fieldWidthMap map[string]int) {
 	for _, field := range fieldList {
-		tmpl := "%-" + strconv.Itoa(showFieldMap[field]+GAP) + "s"
+		tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]+GAP) + "s"
 		fmt.Printf(tmpl, field)
 	}
 	fmt.Printf("\n")
 
 	for _, row := range rowList {
 		for _, field := range fieldList {
 			cutWidth := calcCutWidth(fmt.Sprintf("%v", row[field]))
-			tmpl := "%-" + strconv.Itoa(showFieldMap[field]-cutWidth+GAP) + "v"
+			tmpl := "%-" + strconv.Itoa(fieldWidthMap[field]-cutWidth+GAP) + "v"
 			fmt.Printf(tmpl, row[field])
 		}
 		fmt.Printf("\n")
 	}
 }
 
 func calcCutWidth(text string) int {
-	set := []*unicode.RangeTable{unicode.Han}
+	set := []*unicode.RangeTable{unicode.Han, unicode.Punct}
 	width := 0
 	for _, r := range text {
-		if unicode.IsOneOf(set, r) {
+		if unicode.IsOneOf(set, r) && r > unicode.MaxLatin1 {
 			width++
 		}
 	}
 	return width
 }
 
 func calcWidth(text string) int {
-	set := []*unicode.RangeTable{unicode.Han}
+	set := []*unicode.RangeTable{unicode.Han, unicode.Punct}
 	width := 0
 	for _, r := range text {
-		if unicode.IsOneOf(set, r) {
+		if unicode.IsOneOf(set, r) && r > unicode.MaxLatin1 {
 			width += 2
 		} else {
 			width++

util/cli_test.go base/util_test.goutil/cli_test.go renamed to base/util_test.go

@@ -1,10 +1,10 @@
-package util
+package base
 
 import "testing"
 
 func TestGetHomePath(t *testing.T) {
 	home := GetHomePath()
 	if home == "" {
-		t.Errorf("util.GetHomePath(), home shoud not be empty. Got :%q", home)
+		t.Errorf("base.GetHomePath(), home shoud not be empty. Got :%q", home)
 	}
 }

cmd/completion.go

@@ -23,15 +23,15 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 // NewCmdCompletion ucloud completion
 func NewCmdCompletion() *cobra.Command {
 	var completionCmd = &cobra.Command{
 		Use:   "completion",
-		Short: "Turn on auto completion according to the prompt",
-		Long:  "Turn on auto completion according to the prompt",
+		Short: "Print the description of how to enable auto completion",
+		Long:  "Print the description of how to enable auto completion",
 		Run: func(cmd *cobra.Command, args []string) {
 			shell, ok := os.LookupEnv("SHELL")
 			if ok {

cmd/configure.go

@@ -15,13 +15,13 @@
 package cmd
 
 import (
-	"fmt"
 	"reflect"
-	"strings"
+
+	"github.com/ucloud/ucloud-cli/ux"
 
 	"github.com/spf13/cobra"
 
-	. "github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 var config = ConfigInstance
@@ -46,16 +46,12 @@ func NewCmdInit() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			Cxt.Println(configDesc)
 			if len(config.PrivateKey) != 0 && len(config.PublicKey) != 0 {
-				Cxt.Printf("Your have already configured public-key and private-key. Do you want to overwrite it? (y/n):")
-				var overwrite string
-				_, err := fmt.Scanf("%s\n", &overwrite)
+				confirm, err := ux.Prompt("Your have already configured public-key and private-key. Do you want to overwrite it? (y/n):")
 				if err != nil {
 					Cxt.Println(err)
 					return
 				}
-				overwrite = strings.Trim(overwrite, " ")
-				overwrite = strings.ToLower(overwrite)
-				if overwrite != "yes" && overwrite != "y" {
+				if confirm {
 					printHello()
 					return
 				}
@@ -110,6 +106,43 @@ func NewCmdConfig() *cobra.Command {
 		Long:    `Configure UCloud CLI options such as private-key,public-key,default region and default project-id.`,
 		Example: "ucloud config list; ucloud config --region cn-bj2",
 		Run: func(cmd *cobra.Command, args []string) {
+			if cfg.Region != "" || cfg.Zone != "" {
+				regionMap, err := fetchRegion()
+				if err != nil {
+					HandleError(err)
+					return
+				}
+
+				region := cfg.Region
+				if region == "" {
+					region = config.Region
+				}
+
+				zones, ok := regionMap[region]
+				if !ok {
+					Cxt.Printf("Error, region[%s] not exist! See 'ucloud region'\n", region)
+					return
+				}
+
+				zone := cfg.Zone
+				if zone == "" {
+					zone = config.Zone
+				}
+
+				if zone != "" {
+					zoneExist := false
+					for _, zone := range zones {
+						if zone == cfg.Zone {
+							zoneExist = true
+						}
+					}
+					if !zoneExist {
+						Cxt.Printf("Error, zone[%s] not exist in region[%s]! See 'ucloud config list' and 'ucloud region'\n", zone, region)
+						return
+					}
+				}
+			}
+
 			tmpCfgVal := reflect.ValueOf(cfg)
 			configVal := reflect.ValueOf(config).Elem()
 			changed := false

cmd/eip.go

@@ -19,10 +19,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/ucloud/ucloud-sdk-go/sdk"
-
 	"github.com/spf13/cobra"
-	. "github.com/ucloud/ucloud-cli/util"
+
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
+
+	. "github.com/ucloud/ucloud-cli/base"
 )
 
 //NewCmdEIP ucloud eip
@@ -133,9 +134,9 @@ func NewCmdEIPAllocate() *cobra.Command {
 	req.Name = cmd.Flags().String("name", "EIP", "Name of your EIP.")
 	req.Remark = cmd.Flags().String("remark", "", "Remark of your EIP.")
 	req.CouponId = cmd.Flags().String("coupon-id", "", "Coupon ID, The Coupon can deducte part of the payment")
-	cmd.Flags().SetFlagValues("line", []string{"BGP", "International"})
-	cmd.Flags().SetFlagValues("charge-mode", []string{"Bandwidth", "Traffic", "ShareBandwidth"})
-	cmd.Flags().SetFlagValues("charge-type", []string{"Month", "Year", "Dynamic", "Trial"})
+	cmd.Flags().SetFlagValues("line", "BGP", "International")
+	cmd.Flags().SetFlagValues("charge-mode", "Bandwidth", "Traffic", "ShareBandwidth")
+	cmd.Flags().SetFlagValues("charge-type", "Month", "Year", "Dynamic", "Trial")
 	cmd.MarkFlagRequired("line")
 	cmd.MarkFlagRequired("bandwidth")
 	return cmd