add global flag --profile & add 'ucloud ext'

Author: lixiaojun629

Dockerfile

@@ -0,0 +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

Makefile

@@ -1,8 +1,9 @@
 export VERSION=0.1.20
 
-.PHONY : build
-build: 
-	go install && mv ${GOPATH}/bin/ucloud-cli /usr/local/bin/ucloud
+.PHONY : install
+install:
+	go build -i -v -mod=vendor -o out/ucloud main.go
+	cp out/ucloud /usr/local/bin
 
 .PHONY : build_mac
 build_mac:
@@ -25,7 +26,3 @@ build_windows:
 .PHONY : build_all
 build_all: build_mac build_linux build_windows
 
-.PHONY : install
-install:
-	go build -o out/ucloud main.go
-	cp out/ucloud /usr/local/bin

README.md

@@ -5,58 +5,99 @@
 The UCloud CLI provides a unified command line interface to UCloud services. It works on Golang SDK based on UCloud OpenAPI and supports Linux, macOS and Windows. 
 https://docs.ucloud.cn/software/cli/index
 
-## Installing ucloud-cli
+## Installing ucloud-cli on macOS or Linux
 
 **Using Homebrew(Preferred)**
 
-The [Homebrew](https://docs.brew.sh/Installation) package manager may be used on macOS, Linux and Windows Subsystem for Linux (WSL).
+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.
 
 ```
-$ brew install ucloud
+brew install ucloud
 ```
 
 If you have installed ucloud-cli already and want to upgrade to the latest version, just run:
 
 ```
-$ brew upgrade ucloud
+brew upgrade ucloud
 ```
 
 If you come across some errors during the installation via homebrew, please update the homebrew first and try again.
 
 ```
-$ brew update
+brew update
 ```
 
 If the error is still unresolved, try the following command for help.
 
 ```
-$ brew doctor
+brew doctor
 ```
 
 **Building from source**
 
 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.
 
 ```
-$ git clone https://github.com/ucloud/ucloud-cli.git
-$ cd ucloud-cli
-$ make install
+git clone https://github.com/ucloud/ucloud-cli.git
+cd ucloud-cli
+make install
 ```
 
 **Downloading binary release**
 
-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.
+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.14/ucloud-cli-macosx-0.1.14-amd64.tgz
-echo "6953232b20f3474973cf234218097006a2e0d1d049c115da6c0e09c103762d4d *ucloud-cli-macosx-0.1.14-amd64.tgz" | shasum -c
-tar zxf ucloud-cli-macosx-0.1.14-amd64.tgz -C /usr/local/bin/
+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/
 ```
 
-## Enabling Shell Auto-Completion
+## Installing ucloud cli on Windows
+
+**Building from source**
+
+Download the source code of ucloud cli from [releases page](https://github.com/ucloud/ucloud-cli/releases). You can also download it by running ```git clone https://github.com/ucloud/ucloud-cli.git```
+Ensure you have git installed, because go will download packages using git. Go to the directory of the source code, and then compile the source code by running "go build -o ucloud.exe"
+After that add ucloud.exe to your environment variable PATH. You could follow [this document](https://www.java.com/en/download/help/path.xml) if you don't know how to do. 
+Open CMD Terminal and run ```ucloud --version ``` to test installation. 
+
+
+**Downloading binary release**
+
+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 , and extract it. Add binary file ucloud.exe to your environment variable PATH following [this document](https://www.java.com/en/download/help/path.xml)
+
+## 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
+```
+
+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 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
+```
+Run bash command in ucloud-cli container, and then you could play with ucloud cli.
+
+```
+docker exec -it ucloud-cli bash
+```
+
+## Enabling Shell Auto-Completion for bash or zsh shell user.
 
 UCloud CLI also has auto-completion support. It can be set up so that if you partially type a command and then press TAB, the rest of the command is automatically filled in.
 

base/config.go

@@ -3,7 +3,6 @@ package base
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"os"
 	"strings"
@@ -21,6 +20,9 @@ var ConfigFilePath = fmt.Sprintf("%s/%s", GetConfigDir(), "config.json")
 //CredentialFilePath path of credential.json
 var CredentialFilePath = fmt.Sprintf("%s/%s", GetConfigDir(), "credential.json")
 
+//LocalFileMode file mode of $HOME/ucloud/*
+const LocalFileMode os.FileMode = 0600
+
 //DefaultTimeoutSec default timeout for requesting api, 15s
 const DefaultTimeoutSec = 15
 
@@ -34,7 +36,11 @@ const DefaultProfile = "default"
 const Version = "0.1.20"
 
 //ConfigIns 配置实例, 程序加载时生成
-var ConfigIns = &AggConfig{Profile: "default"}
+var ConfigIns = &AggConfig{
+	Profile: DefaultProfile,
+	BaseURL: DefaultBaseURL,
+	Timeout: DefaultTimeoutSec,
+}
 
 //AggConfigListIns 配置列表, 进程启动时从本地文件加载
 var AggConfigListIns = &AggConfigManager{}
@@ -59,6 +65,7 @@ type GlobalFlag struct {
 	Completion bool
 	Config     bool
 	Signup     bool
+	Profile    string
 }
 
 //CLIConfig cli_config element
@@ -162,17 +169,16 @@ func (p *AggConfig) copyToCredentialConfig(target *CredentialConfig) {
 type AggConfigManager struct {
 	activeProfile string
 	configs       map[string]*AggConfig
-	cfgFile       io.Reader
-	credFile      io.Reader
+	configFile    *os.File
+	credFile      *os.File
 }
 
 //NewAggConfigManager create instance
-func NewAggConfigManager(cfgFile, credFile io.Reader) (*AggConfigManager, error) {
-
+func NewAggConfigManager(cfgFile, credFile *os.File) (*AggConfigManager, error) {
 	manager := &AggConfigManager{
-		configs:  make(map[string]*AggConfig),
-		cfgFile:  cfgFile,
-		credFile: credFile,
+		configs:    make(map[string]*AggConfig),
+		configFile: cfgFile,
+		credFile:   credFile,
 	}
 
 	err := manager.Load()
@@ -183,7 +189,7 @@ func NewAggConfigManager(cfgFile, credFile io.Reader) (*AggConfigManager, error)
 
 		aerr := adaptOldConfig()
 		if aerr != nil {
-			HandleError(aerr)
+			HandleError(fmt.Errorf("adapt to old config failed: %v", aerr))
 			return manager, aerr
 		}
 
@@ -296,8 +302,8 @@ func (p *AggConfigManager) Save() error {
 		aggConfig.copyToCredentialConfig(credConfig)
 		credcs = append(credcs, credConfig)
 	}
-	aerr := WriteJSONFile(clics, ConfigFilePath)
-	berr := WriteJSONFile(credcs, CredentialFilePath)
+	aerr := WriteJSONFile(clics, p.configFile.Name())
+	berr := WriteJSONFile(credcs, p.credFile.Name())
 
 	if aerr != nil && berr != nil {
 		return fmt.Errorf("save cli config failed: %v | save credentail failed: %v", aerr, berr)
@@ -365,26 +371,43 @@ func (p *AggConfigManager) GetActiveAggConfig() (*AggConfig, error) {
 	return nil, fmt.Errorf("active profile not found. see 'ucloud config list'")
 }
 
+//GetActiveAggConfigName get active config name
+func (p *AggConfigManager) GetActiveAggConfigName() string {
+	if ac, ok := p.configs[p.activeProfile]; ok {
+		return ac.Profile
+	}
+	return ""
+}
+
 func (p *AggConfigManager) parseCLIConfigs() ([]CLIConfig, error) {
-	byts, err := ioutil.ReadAll(p.cfgFile)
+	var configs []CLIConfig
+	rawConfig, err := ioutil.ReadAll(p.configFile)
 	if err != nil {
 		return nil, err
 	}
-	configs := []CLIConfig{}
-	err = json.Unmarshal(byts, &configs)
+	if len(rawConfig) == 0 {
+		return nil, nil
+	}
+
+	err = json.Unmarshal(rawConfig, &configs)
 	if err != nil {
 		return nil, fmt.Errorf("parse cli config faild: %v", err)
 	}
 	return configs, nil
 }
 
 func (p *AggConfigManager) parseCredentials() ([]CredentialConfig, error) {
-	byts, err := ioutil.ReadAll(p.credFile)
+	var credentials []CredentialConfig
+	rawCred, err := ioutil.ReadAll(p.credFile)
 	if err != nil {
 		return nil, err
 	}
-	credentials := make([]CredentialConfig, 0)
-	err = json.Unmarshal(byts, &credentials)
+
+	if len(rawCred) == 0 {
+		return nil, nil
+	}
+
+	err = json.Unmarshal(rawCred, &credentials)
 	if err != nil {
 		return nil, fmt.Errorf("parse credential failed: %v", err)
 	}
@@ -470,11 +493,19 @@ func adaptOldConfig() error {
 	return AggConfigListIns.Append(ac)
 }
 
+func init() {
+	bc, err := GetBizClient(ConfigIns)
+	if err != nil {
+		HandleError(err)
+	}
+	BizClient = bc
+}
+
 //GetBizClient 初始化BizClient
 func GetBizClient(ac *AggConfig) (*Client, error) {
 	timeout, err := time.ParseDuration(fmt.Sprintf("%ds", ac.Timeout))
 	if err != nil {
-		return nil, fmt.Errorf("parse timeout %ds failed: %v", ac.Timeout, err)
+		err = fmt.Errorf("parse timeout %ds failed: %v", ac.Timeout, err)
 	}
 	ClientConfig = &sdk.Config{
 		BaseUrl:    ac.BaseURL,
@@ -492,64 +523,61 @@ func GetBizClient(ac *AggConfig) (*Client, error) {
 		PrivateKey: ac.PrivateKey,
 	}
 
-	return NewClient(ClientConfig, AuthCredential), nil
+	return NewClient(ClientConfig, AuthCredential), err
 }
 
-func init() {
-	initConfigDir()
-	//配置日志
-	err := initLog()
-	if err != nil {
-		fmt.Println(err)
-	}
-	cfgFile, err := os.Open(ConfigFilePath)
-	if err != nil {
+//InitConfig 初始化配置
+func InitConfig() {
+	configFile, err := os.OpenFile(ConfigFilePath, os.O_CREATE|os.O_RDONLY, LocalFileMode)
+	if err != nil && !os.IsNotExist(err) {
 		HandleError(err)
-	} else {
-		defer cfgFile.Close()
 	}
-
-	credFile, err := os.Open(CredentialFilePath)
-	if err != nil {
+	credFile, err := os.OpenFile(CredentialFilePath, os.O_CREATE|os.O_RDONLY, LocalFileMode)
+	if err != nil && !os.IsNotExist(err) {
 		HandleError(err)
-	} else {
-		defer credFile.Close()
 	}
 
-	AggConfigListIns, err = NewAggConfigManager(cfgFile, credFile)
+	AggConfigListIns, err = NewAggConfigManager(configFile, credFile)
 	if err != nil {
-		HandleError(err)
-		ins := &AggConfig{
-			BaseURL: "https://api.ucloud.cn",
-			Timeout: 15,
-			Profile: "default",
-		}
-		bc, err := GetBizClient(ins)
-		if err != nil {
-			HandleError(err)
-		} else {
-			BizClient = bc
-		}
+		LogError(err.Error())
 	} else {
-		ins, err := AggConfigListIns.GetActiveAggConfig()
-		if err != nil {
-			LogInfo(fmt.Sprintf("load active config failed: %v", err))
-			ins = &AggConfig{
-				BaseURL: DefaultBaseURL,
-				Timeout: DefaultTimeoutSec,
+		var ins *AggConfig
+		if Global.Profile == "" {
+			ins, err = AggConfigListIns.GetActiveAggConfig()
+			if err != nil && len(AggConfigListIns.GetAggConfigList()) != 0 {
+				HandleError(err)
 			}
 		} else {
+			var ok bool
+			ins, ok = AggConfigListIns.GetAggConfigByProfile(Global.Profile)
+			if !ok {
+				HandleError(fmt.Errorf("Profile %s does not exist", Global.Profile))
+			}
+		}
+
+		if ins != nil {
 			ConfigIns = ins
-			tmpIns := *ins
-			tmpIns.PublicKey = MosaicString(tmpIns.PublicKey, 5, 5)
-			tmpIns.PrivateKey = MosaicString(tmpIns.PrivateKey, 5, 5)
-			LogInfo(fmt.Sprintf("load active config : %#v", tmpIns))
+		} else {
+			ins = ConfigIns
 		}
-		bc, err := GetBizClient(ins)
+
+		tmpIns := *ins
+		tmpIns.PublicKey = MosaicString(tmpIns.PublicKey, 5, 5)
+		tmpIns.PrivateKey = MosaicString(tmpIns.PrivateKey, 5, 5)
+		LogInfo(fmt.Sprintf("load active config : %#v", tmpIns))
+		bc, err := GetBizClient(ConfigIns)
 		if err != nil {
 			HandleError(err)
 		} else {
 			BizClient = bc
 		}
 	}
 }
+
+func init() {
+	//配置日志
+	err := initLog()
+	if err != nil {
+		fmt.Println(err)
+	}
+}