Merge pull request #36 from lixiaojun629/develop

ucloud 0.1.22

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.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 echo "complete -C $(which ucloud) ucloud" >> ~/.bashrc
+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 echo "complete -C $(which ucloud) ucloud" >> ~/.bashrc

Makefile

@@ -1,4 +1,4 @@
-export VERSION=0.1.21
+export VERSION=0.1.22
 
 .PHONY : install
 install:

base/config.go

@@ -26,20 +26,24 @@ const LocalFileMode os.FileMode = 0600
 //DefaultTimeoutSec default timeout for requesting api, 15s
 const DefaultTimeoutSec = 15
 
+//DefaultMaxRetryTimes default timeout for requesting api, 15s
+const DefaultMaxRetryTimes = 3
+
 //DefaultBaseURL location of api server
 const DefaultBaseURL = "https://api.ucloud.cn/"
 
 //DefaultProfile name of default profile
 const DefaultProfile = "default"
 
 //Version 版本号
-const Version = "0.1.21"
+const Version = "0.1.22"
 
 //ConfigIns 配置实例, 程序加载时生成
 var ConfigIns = &AggConfig{
-	Profile: DefaultProfile,
-	BaseURL: DefaultBaseURL,
-	Timeout: DefaultTimeoutSec,
+	Profile:       DefaultProfile,
+	BaseURL:       DefaultBaseURL,
+	Timeout:       DefaultTimeoutSec,
+	MaxRetryTimes: sdk.Int(DefaultMaxRetryTimes),
 }
 
 //AggConfigListIns 配置列表, 进程启动时从本地文件加载
@@ -66,17 +70,20 @@ type GlobalFlag struct {
 	Config     bool
 	Signup     bool
 	Profile    string
+	PublicKey  string
+	PrivateKey string
 }
 
 //CLIConfig cli_config element
 type CLIConfig struct {
-	ProjectID string `json:"project_id"`
-	Region    string `json:"region"`
-	Zone      string `json:"zone"`
-	BaseURL   string `json:"base_url"`
-	Timeout   int    `json:"timeout_sec"`
-	Profile   string `json:"profile"`
-	Active    bool   `json:"active"` //是否生效
+	ProjectID     string `json:"project_id"`
+	Region        string `json:"region"`
+	Zone          string `json:"zone"`
+	BaseURL       string `json:"base_url"`
+	Timeout       int    `json:"timeout_sec"`
+	Profile       string `json:"profile"`
+	Active        bool   `json:"active"` //是否生效
+	MaxRetryTimes *int   `json:"max_retry_times"`
 }
 
 //CredentialConfig credential element
@@ -88,15 +95,16 @@ type CredentialConfig struct {
 
 //AggConfig 聚合配置 config+credential
 type AggConfig struct {
-	Profile    string `json:"profile"`
-	Active     bool   `json:"active"`
-	ProjectID  string `json:"project_id"`
-	Region     string `json:"region"`
-	Zone       string `json:"zone"`
-	BaseURL    string `json:"base_url"`
-	Timeout    int    `json:"timeout_sec"`
-	PublicKey  string `json:"public_key"`
-	PrivateKey string `json:"private_key"`
+	Profile       string `json:"profile"`
+	Active        bool   `json:"active"`
+	ProjectID     string `json:"project_id"`
+	Region        string `json:"region"`
+	Zone          string `json:"zone"`
+	BaseURL       string `json:"base_url"`
+	Timeout       int    `json:"timeout_sec"`
+	PublicKey     string `json:"public_key"`
+	PrivateKey    string `json:"private_key"`
+	MaxRetryTimes *int   `json:"max_retry_times"`
 }
 
 //ConfigPublicKey 输入公钥
@@ -157,6 +165,7 @@ func (p *AggConfig) copyToCLIConfig(target *CLIConfig) {
 	target.Region = p.Region
 	target.Zone = p.Zone
 	target.Active = p.Active
+	target.MaxRetryTimes = p.MaxRetryTimes
 }
 
 func (p *AggConfig) copyToCredentialConfig(target *CredentialConfig) {
@@ -267,15 +276,16 @@ func (p *AggConfigManager) Load() error {
 		}
 
 		p.configs[profile] = &AggConfig{
-			PrivateKey: cred.PrivateKey,
-			PublicKey:  cred.PublicKey,
-			Profile:    config.Profile,
-			ProjectID:  config.ProjectID,
-			Region:     config.Region,
-			Zone:       config.Zone,
-			BaseURL:    config.BaseURL,
-			Timeout:    config.Timeout,
-			Active:     config.Active,
+			PrivateKey:    cred.PrivateKey,
+			PublicKey:     cred.PublicKey,
+			Profile:       config.Profile,
+			ProjectID:     config.ProjectID,
+			Region:        config.Region,
+			Zone:          config.Zone,
+			BaseURL:       config.BaseURL,
+			Timeout:       config.Timeout,
+			Active:        config.Active,
+			MaxRetryTimes: config.MaxRetryTimes,
 		}
 	}
 
@@ -393,6 +403,12 @@ func (p *AggConfigManager) parseCLIConfigs() ([]CLIConfig, error) {
 	if err != nil {
 		return nil, fmt.Errorf("parse cli config faild: %v", err)
 	}
+	//特殊处理未配置max_retry_times的情况，v0.1.21之前硬编码重试次数为3
+	for idx := range configs {
+		if configs[idx].MaxRetryTimes == nil {
+			configs[idx].MaxRetryTimes = sdk.Int(DefaultMaxRetryTimes)
+		}
+	}
 	return configs, nil
 }
 
@@ -476,15 +492,16 @@ func adaptOldConfig() error {
 		return err
 	}
 	ac := &AggConfig{
-		Profile:    DefaultProfile,
-		ProjectID:  oc.ProjectID,
-		Region:     oc.Region,
-		Zone:       oc.Zone,
-		BaseURL:    DefaultBaseURL,
-		Timeout:    DefaultTimeoutSec,
-		Active:     true,
-		PrivateKey: oc.PrivateKey,
-		PublicKey:  oc.PublicKey,
+		Profile:       DefaultProfile,
+		ProjectID:     oc.ProjectID,
+		Region:        oc.Region,
+		Zone:          oc.Zone,
+		BaseURL:       DefaultBaseURL,
+		Timeout:       DefaultTimeoutSec,
+		Active:        true,
+		PrivateKey:    oc.PrivateKey,
+		PublicKey:     oc.PublicKey,
+		MaxRetryTimes: sdk.Int(DefaultMaxRetryTimes),
 	}
 	err = os.Rename(ConfigFilePath, ConfigFilePath+".old")
 	if err != nil {
@@ -515,12 +532,19 @@ func GetBizClient(ac *AggConfig) (*Client, error) {
 		Region:     ac.Region,
 		Zone:       ac.Zone,
 		ProjectId:  ac.ProjectID,
-		MaxRetries: 3,
+		MaxRetries: *ac.MaxRetryTimes,
 	}
 
-	AuthCredential = &auth.Credential{
-		PublicKey:  ac.PublicKey,
-		PrivateKey: ac.PrivateKey,
+	if Global.PublicKey != "" && Global.PrivateKey != "" {
+		AuthCredential = &auth.Credential{
+			PublicKey:  Global.PublicKey,
+			PrivateKey: Global.PrivateKey,
+		}
+	} else {
+		AuthCredential = &auth.Credential{
+			PublicKey:  ac.PublicKey,
+			PrivateKey: ac.PrivateKey,
+		}
 	}
 
 	return NewClient(ClientConfig, AuthCredential), err
@@ -551,7 +575,7 @@ func InitConfig() {
 			var ok bool
 			ins, ok = AggConfigListIns.GetAggConfigByProfile(Global.Profile)
 			if !ok {
-				HandleError(fmt.Errorf("Profile %s does not exist", Global.Profile))
+				LogError("Profile %s does not exist", Global.Profile)
 			}
 		}
 

base/log.go

@@ -56,15 +56,17 @@ func GetLogFilePath() string {
 func LogInfo(logs ...string) {
 	mu.Lock()
 	defer mu.Unlock()
+	goID := curGoroutineID()
 	for _, line := range logs {
-		logger.Info(line)
+		logger.WithField("GoroutineID", goID).Info(line)
 	}
 }
 
 //LogError 记录日志
 func LogError(logs ...string) {
+	goID := curGoroutineID()
 	for _, line := range logs {
-		logger.Error(line)
+		logger.WithField("GoroutineID", goID).Error(line)
 		fmt.Fprintln(out, line)
 	}
 }

base/util.go

@@ -213,6 +213,9 @@ func displaySlice(listVal reflect.Value, fieldList []string) {
 			field := elemVal.Field(j)
 			fieldName := elemType.Field(j).Name
 			if _, ok := showFieldMap[fieldName]; ok {
+				if field.Kind() == reflect.Ptr {
+					field = field.Elem()
+				}
 				text := fmt.Sprintf("%v", field.Interface())
 				cells := strings.Split(text, "\n")
 				for i, cell := range cells {
@@ -627,3 +630,19 @@ func Confirm(yes bool, text string) bool {
 	}
 	return sure
 }
+
+func curGoroutineID() int64 {
+	var (
+		buf [64]byte
+		n   = runtime.Stack(buf[:], false)
+		stk = strings.TrimPrefix(string(buf[:n]), "goroutine ")
+	)
+
+	idField := strings.Fields(stk)[0]
+	id, err := strconv.Atoi(idField)
+	if err != nil {
+		panic(fmt.Errorf("can not get goroutine id: %v", err))
+	}
+
+	return int64(id)
+}

cmd/configure.go

@@ -19,6 +19,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+	sdk "github.com/ucloud/ucloud-sdk-go/ucloud"
 	uerr "github.com/ucloud/ucloud-sdk-go/ucloud/error"
 
 	"github.com/ucloud/ucloud-cli/base"
@@ -204,6 +205,14 @@ func NewCmdConfig() *cobra.Command {
 				cacheConfig.Timeout = cfg.Timeout
 			}
 
+			if *cfg.MaxRetryTimes == 0 {
+				if *cacheConfig.MaxRetryTimes == 0 {
+					cacheConfig.MaxRetryTimes = sdk.Int(base.DefaultMaxRetryTimes)
+				}
+			} else {
+				cacheConfig.MaxRetryTimes = cfg.MaxRetryTimes
+			}
+
 			if cfg.Region != "" {
 				cacheConfig.Region = cfg.Region
 			}
@@ -274,6 +283,7 @@ func NewCmdConfig() *cobra.Command {
 	flags.StringVar(&cfg.ProjectID, "project-id", "", "Optional. Set default project. For instance 'org-xxxxxx'. See 'ucloud project list")
 	flags.StringVar(&cfg.BaseURL, "base-url", "", "Optional. Set default base url. For instance 'https://api.ucloud.cn/'")
 	flags.IntVar(&cfg.Timeout, "timeout-sec", 0, "Optional. Set default timeout for requesting API. Unit: seconds")
+	cfg.MaxRetryTimes = flags.Int("max-retry-times", 0, "Optional. Set default max-retry-times for idempotent APIs which can be called many times without side effect, for example 'ReleaseEIP'")
 	flags.StringVar(&active, "active", "", "Optional. Mark the profile to be effective or not. Accept valeus: true or false")
 
 	flags.SetFlagValues("active", "true", "false")
@@ -344,6 +354,7 @@ func NewCmdConfigAdd() *cobra.Command {
 	flags.StringVar(&cfg.ProjectID, "project-id", "", "Optional. Set default project. For instance 'org-xxxxxx'. See 'ucloud project list")
 	flags.StringVar(&cfg.BaseURL, "base-url", base.DefaultBaseURL, "Optional. Set default base url. For instance 'https://api.ucloud.cn/'")
 	flags.IntVar(&cfg.Timeout, "timeout-sec", base.DefaultTimeoutSec, "Optional. Set default timeout for requesting API. Unit: seconds")
+	cfg.MaxRetryTimes = flags.Int("max-retry-times", base.DefaultMaxRetryTimes, "Optional. Set default max-retry-times for idempotent APIs which can be called many times without side effect, for example 'ReleaseEIP'")
 	flags.StringVar(&active, "active", "false", "Optional. Mark the profile to be effective or not. Accept valeus: true or false")
 
 	flags.SetFlagValues("active", "true", "false")
@@ -363,7 +374,7 @@ func NewCmdConfigAdd() *cobra.Command {
 
 //NewCmdConfigUpdate ucloud config update
 func NewCmdConfigUpdate() *cobra.Command {
-	var timeout, active string
+	var timeout, active, maxRetries string
 	cfg := &base.AggConfig{}
 	cmd := &cobra.Command{
 		Use:   "update",
@@ -426,7 +437,21 @@ func NewCmdConfigUpdate() *cobra.Command {
 			}
 
 			if cacheConfig.Timeout <= 0 {
-				base.HandleError(fmt.Errorf("timeout-sec must be larger than 0, accept %d", cfg.Timeout))
+				base.HandleError(fmt.Errorf("timeout-sec must be greater than 0, accept %d", cfg.Timeout))
+				return
+			}
+
+			if maxRetries != "" {
+				times, err := strconv.Atoi(maxRetries)
+				if err != nil {
+					base.HandleError(fmt.Errorf("parse max-retry-times failed: %v", err))
+					return
+				}
+				cacheConfig.MaxRetryTimes = &times
+			}
+
+			if *cacheConfig.MaxRetryTimes < 0 {
+				base.HandleError(fmt.Errorf("max-retry-timesc must be greater than or equal to 0, accept %d", cfg.MaxRetryTimes))
 				return
 			}
 
@@ -457,6 +482,7 @@ func NewCmdConfigUpdate() *cobra.Command {
 	flags.StringVar(&cfg.ProjectID, "project-id", "", "Optional. Set default project. For instance 'org-xxxxxx'. See 'ucloud project list")
 	flags.StringVar(&cfg.BaseURL, "base-url", "", "Optional. Set default base url. For instance 'https://api.ucloud.cn/'")
 	flags.StringVar(&timeout, "timeout-sec", "", "Optional. Set default timeout for requesting API. Unit: seconds")
+	flags.StringVar(&maxRetries, "max-retry-times", "", "Optional. Set default max retry times for idempotent APIs which can be called many times without side effect, for example 'ReleaseEIP'")
 	flags.StringVar(&active, "active", "", "Optional. Mark the profile to be effective")
 
 	flags.SetFlagValuesFunc("profile", func() []string { return base.AggConfigListIns.GetProfileNameList() })