add uhost

Author: lixiaojun629

cmd/completion.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"github.com/ucloud/ucloud-cli/util"
+	. "github.com/ucloud/ucloud-cli/util"
 )
 
 // NewCmdCompletion ucloud completion
@@ -97,7 +97,7 @@ func getBashVersion() (version string, err error) {
 	lookupBashVersion := exec.Command("bash", "-version")
 	out, err := lookupBashVersion.Output()
 	if err != nil {
-		util.Tracer.AppendError(err)
+		Cxt.PrintErr(err)
 		fmt.Println(err)
 	}
 
@@ -121,10 +121,10 @@ func getBashVersion() (version string, err error) {
 }
 
 func bashCompletion(cmd *cobra.Command) {
-	home := util.GetHomePath()
-	shellPath := home + "/" + util.ConfigPath + "/ucloud.sh"
+	home := GetHomePath()
+	shellPath := home + "/" + ConfigPath + "/ucloud.sh"
 	cmd.GenBashCompletionFile(shellPath)
-	fmt.Printf("Completion scripts has been written to '~/%s/ucloud.sh'\n", util.ConfigPath)
+	fmt.Printf("Completion scripts has been written to '~/%s/ucloud.sh'\n", ConfigPath)
 
 	platform := runtime.GOOS
 
@@ -136,20 +136,19 @@ func bashCompletion(cmd *cobra.Command) {
 }
 
 func zshCompletion(cmd *cobra.Command) {
-	home := util.GetHomePath()
-	shellPath := home + "/" + util.ConfigPath + "/_ucloud"
+	home := GetHomePath()
+	shellPath := home + "/" + ConfigPath + "/_ucloud"
 	file, err := os.Create(shellPath)
 	if err != nil {
-		fmt.Println(err)
-		util.Tracer.AppendError(err)
+		Cxt.PrintErr(err)
 		return
 	}
 	defer file.Close()
 
 	runCompletionZsh(file, cmd)
-	fmt.Printf("Completion scripts was written to '~/%s/_ucloud'\n", util.ConfigPath)
+	fmt.Printf("Completion scripts was written to '~/%s/_ucloud'\n", ConfigPath)
 
-	scripts := fmt.Sprintf("fpath=(~/%s $fpath)\n", util.ConfigPath)
+	scripts := fmt.Sprintf("fpath=(~/%s $fpath)\n", ConfigPath)
 	scripts += "autoload -U +X compinit && compinit"
 	fmt.Printf("Please append the following scripts to your ~/.zshrc\n%s\n", scripts)
 }

cmd/configure.go

@@ -64,29 +64,28 @@ func NewCmdConfig() *cobra.Command {
 			config.ConfigPublicKey()
 			config.ConfigPrivateKey()
 
-			region, err := getDefaultRegion()
+			region, zone, err := getDefaultRegion()
 			if err != nil {
-				Tracer.Println(err)
+				Cxt.Println(err)
 				return
-			} else {
-				config.Region = region
-				fmt.Printf("Configured default region:%s\n", region)
 			}
+			config.Region = region
+			config.Zone = zone
+			Cxt.Printf("Configured default region:%s zone:%s\n", region, zone)
 
-			project, err := getDefaultProject()
+			projectId, projectName, err := getDefaultProject()
 			if err != nil {
-				Tracer.Println(err)
+				Cxt.Println(err)
 				return
-			} else {
-				config.ProjectID = project
-				fmt.Printf("Configured default project:%s\n", project)
 			}
+			config.ProjectID = projectId
+			Cxt.Printf("Configured default project:%s %s\n", projectId, projectName)
 
 			config.SaveConfig()
 
 			userInfo, err := getUserInfo()
 
-			fmt.Printf("You are logged in as: [%s]\n", userInfo.UserEmail)
+			Cxt.Printf("You are logged in as: [%s]\n", userInfo.UserEmail)
 
 			certified := isUserCertified(userInfo)
 			if err != nil {
@@ -120,7 +119,7 @@ func NewCmdConfigList() *cobra.Command {
 		Short: "list all settings",
 		Long:  `list all settings`,
 		Run: func(cmd *cobra.Command, args []string) {
-			config.ListConfig()
+			config.ListConfig(global.json)
 		},
 	}
 	return configListCmd
@@ -155,14 +154,16 @@ func NewCmdConfigSet() *cobra.Command {
 			switch args[0] {
 			case "region":
 				config.Region = args[1]
+			case "zone":
+				config.Zone = args[1]
 			case "project-id":
 				config.ProjectID = args[1]
 			case "public-key":
 				config.PublicKey = args[1]
 			case "private-key":
 				config.PrivateKey = args[1]
 			default:
-				fmt.Println("Only public-key, private-key, region, project-id supported")
+				Cxt.Println("Only public-key, private-key, region, zone and project-id supported")
 			}
 			config.SaveConfig()
 		},