Skip to content

Commit 6730f70

Browse files
committed
init: donot report error when user dose not have default project
1 parent 452c503 commit 6730f70

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

cmd/configure.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package cmd
1616

1717
import (
18+
"errors"
1819
"fmt"
1920
"strconv"
2021

@@ -26,7 +27,7 @@ import (
2627
"github.com/ucloud/ucloud-cli/base"
2728
)
2829

29-
const configDesc = `Public-key and private-key could be acquired from https://console.ucloud.cn/uapi/apikey.`
30+
const configDesc = `Public-key and private-key could be acquired from https://console.ucloud.cn/uaccount/api_manage`
3031

3132
const helloUcloud = `
3233
_ _ _ _ _ _ _____ _ _
@@ -72,12 +73,16 @@ func NewCmdInit() *cobra.Command {
7273
fmt.Printf("Configured default region:%s zone:%s\n", region.DefaultRegion, region.DefaultZone)
7374

7475
projectID, projectName, err := getDefaultProjectWithConfig(base.ConfigIns)
75-
if err != nil {
76+
if err != nil && !errors.Is(err, errNoDefaultProject) {
7677
base.HandleError(err)
7778
return
7879
}
79-
base.ConfigIns.ProjectID = projectID
80-
fmt.Printf("Configured default project:%s %s\n", projectID, projectName)
80+
if projectID != "" && projectName != "" {
81+
base.ConfigIns.ProjectID = projectID
82+
fmt.Printf("Configured default project:%s %s\n", projectID, projectName)
83+
} else {
84+
fmt.Println("No default project, skip.")
85+
}
8186
base.ConfigIns.Timeout = base.DefaultTimeoutSec
8287
base.ConfigIns.BaseURL = base.DefaultBaseURL
8388
base.ConfigIns.MaxRetryTimes = sdk.Int(base.DefaultMaxRetryTimes)

cmd/region.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ package cmd
1616

1717
import (
1818
"encoding/json"
19+
"errors"
1920
"fmt"
2021
"io"
2122
"io/ioutil"
@@ -164,6 +165,8 @@ func getZoneList(region string) []string {
164165
return list
165166
}
166167

168+
var errNoDefaultProject = errors.New("No default project")
169+
167170
func getDefaultProject() (string, string, error) {
168171
req := base.BizClient.NewGetProjectListRequest()
169172

@@ -176,8 +179,9 @@ func getDefaultProject() (string, string, error) {
176179
return project.ProjectId, project.ProjectName, nil
177180
}
178181
}
179-
return "", "", fmt.Errorf("No default project")
182+
return "", "", errNoDefaultProject
180183
}
184+
181185
func getDefaultProjectWithConfig(cfg *base.AggConfig) (string, string, error) {
182186
bc, err := base.GetBizClient(cfg)
183187
if err != nil {
@@ -194,7 +198,7 @@ func getDefaultProjectWithConfig(cfg *base.AggConfig) (string, string, error) {
194198
return project.ProjectId, project.ProjectName, nil
195199
}
196200
}
197-
return "", "", fmt.Errorf("No default project")
201+
return "", "", errNoDefaultProject
198202
}
199203

200204
func fetchProjectWithConfig(cfg *base.AggConfig) (map[string]bool, error) {

0 commit comments

Comments
 (0)