Skip to content

Commit b2ef439

Browse files
JacksonTianJacksonTian
committed
improve coding styles
1 parent 4b1ccaa commit b2ef439

11 files changed

+83
-47
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ fmt:
7272
go fmt ./cli/... ./config/... ./i18n/... ./main/... ./openapi/... ./oss/... ./resource/... ./meta/...
7373

7474
test:
75-
go test -race -coverprofile=coverage.txt -covermode=atomic ./cli/... ./config/... ./i18n/... ./main/... ./openapi/... ./oss/... ./resource/... ./meta/...
75+
go test -race -coverprofile=coverage.txt -covermode=atomic ./cli/... ./config/... ./i18n/... ./main/... ./openapi/... ./resource/... ./meta/...
7676
go tool cover -html=coverage.txt -o coverage.html

‎config/configuration_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestConfiguration(t *testing.T) {
5959
p, ok := cf.GetProfile("hh")
6060
assert.False(t, ok)
6161
assert.Equal(t, Profile{Name: "hh"}, p)
62-
p, ok = cf.GetProfile("default")
62+
p, _ = cf.GetProfile("default")
6363
assert.Equal(t, Profile{Name: "default", Mode: "", OutputFormat: "json", Language: "en"}, p)
6464

6565
//PutProfile
@@ -114,7 +114,7 @@ func TestLoadProfile(t *testing.T) {
114114
}()
115115
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
116116
return func(path string) (*Configuration, error) {
117-
return &Configuration{CurrentProfile: "default", Profiles: []Profile{Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
117+
return &Configuration{CurrentProfile: "default", Profiles: []Profile{{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, {Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
118118
}
119119
}
120120
//testcase 1
@@ -198,7 +198,7 @@ func TestNewConfigFromBytes(t *testing.T) {
198198

199199
conf, err := NewConfigFromBytes([]byte(bytesConf))
200200
assert.Nil(t, err)
201-
assert.Equal(t, &Configuration{Profiles: []Profile{Profile{Language: "en", Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json"}}}, conf)
201+
assert.Equal(t, &Configuration{Profiles: []Profile{{Language: "en", Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json"}}}, conf)
202202
}
203203

204204
func TestSaveConfiguration(t *testing.T) {
@@ -212,7 +212,7 @@ func TestSaveConfiguration(t *testing.T) {
212212
return "."
213213
}
214214
}
215-
conf := &Configuration{Profiles: []Profile{Profile{Language: "en", Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json"}}}
215+
conf := &Configuration{Profiles: []Profile{{Language: "en", Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json"}}}
216216
bytes, err := json.MarshalIndent(conf, "", "\t")
217217
assert.Nil(t, err)
218218
err = SaveConfiguration(conf)
@@ -242,15 +242,15 @@ func TestLoadConfiguration(t *testing.T) {
242242
//testcase 1
243243
cf, err := LoadConfiguration(GetConfigPath() + "/" + configFile)
244244
assert.Nil(t, err)
245-
assert.Equal(t, &Configuration{CurrentProfile: "default", Profiles: []Profile{Profile{Name: "default", Mode: "", OutputFormat: "json", Language: "en"}}}, cf)
246-
conf := &Configuration{Profiles: []Profile{Profile{Language: "en", Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json"}}}
245+
assert.Equal(t, &Configuration{CurrentProfile: "default", Profiles: []Profile{{Name: "default", Mode: "", OutputFormat: "json", Language: "en"}}}, cf)
246+
conf := &Configuration{Profiles: []Profile{{Language: "en", Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json"}}}
247247
err = SaveConfiguration(conf)
248248
assert.Nil(t, err)
249249

250250
//testcase 2
251251
w.Reset()
252252
cf, err = LoadConfiguration(GetConfigPath() + "/" + configFile)
253-
assert.Equal(t, &Configuration{CurrentProfile: "", Profiles: []Profile{Profile{Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json", Language: "en"}}}, cf)
253+
assert.Equal(t, &Configuration{CurrentProfile: "", Profiles: []Profile{{Name: "default", Mode: "AK", AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RegionId: "cn-hangzhou", OutputFormat: "json", Language: "en"}}}, cf)
254254
assert.Nil(t, err)
255255

256256
}
@@ -262,7 +262,7 @@ func TestLoadProfileWithContext(t *testing.T) {
262262
}()
263263
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
264264
return func(path string) (*Configuration, error) {
265-
return &Configuration{CurrentProfile: "default", Profiles: []Profile{Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
265+
return &Configuration{CurrentProfile: "default", Profiles: []Profile{{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, {Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
266266
}
267267
}
268268
w := new(bytes.Buffer)

‎config/configure_delete_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func TestDoConfigureDelete(t *testing.T) {
3838
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
3939
return func(path string) (*Configuration, error) {
4040
return &Configuration{CurrentProfile: "default", Profiles: []Profile{
41-
Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
42-
Profile{Name: "bbb", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
41+
{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
42+
{Name: "bbb", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
4343
}
4444
}
4545
hookSaveConfiguration = func(fn func(config *Configuration) error) func(config *Configuration) error {
@@ -73,8 +73,8 @@ func TestDoConfigureDelete(t *testing.T) {
7373
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
7474
return func(path string) (*Configuration, error) {
7575
return &Configuration{CurrentProfile: "default", Profiles: []Profile{
76-
Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
77-
Profile{Name: "bbb", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
76+
{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
77+
{Name: "bbb", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
7878
}
7979
}
8080
hookSaveConfiguration = func(fn func(config *Configuration) error) func(config *Configuration) error {

‎config/configure_get_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ func TestDoConfigureGet(t *testing.T) {
5050
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
5151
return func(path string) (*Configuration, error) {
5252
return &Configuration{CurrentProfile: "default", Profiles: []Profile{
53-
Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
53+
{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
54+
{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
5455
}
5556
}
5657
w.Reset()
@@ -64,8 +65,8 @@ func TestDoConfigureGet(t *testing.T) {
6465
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
6566
return func(path string) (*Configuration, error) {
6667
return &Configuration{CurrentProfile: "default", Profiles: []Profile{
67-
Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
68-
Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
68+
{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
69+
{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
6970
}
7071
}
7172
w.Reset()
@@ -77,7 +78,9 @@ func TestDoConfigureGet(t *testing.T) {
7778
//TESTCASE 4
7879
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
7980
return func(path string) (*Configuration, error) {
80-
return &Configuration{CurrentProfile: "default", Profiles: []Profile{Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
81+
return &Configuration{CurrentProfile: "default", Profiles: []Profile{
82+
{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
83+
{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
8184
}
8285
}
8386
w.Reset()
@@ -90,7 +93,9 @@ func TestDoConfigureGet(t *testing.T) {
9093
//testcase 5
9194
hookLoadConfiguration = func(fn func(path string) (*Configuration, error)) func(path string) (*Configuration, error) {
9295
return func(path string) (*Configuration, error) {
93-
return &Configuration{CurrentProfile: "default", Profiles: []Profile{Profile{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"}, Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
96+
return &Configuration{CurrentProfile: "default", Profiles: []Profile{
97+
{Name: "default", Mode: AK, AccessKeyId: "default_aliyun_access_key_id", AccessKeySecret: "default_aliyun_access_key_secret", OutputFormat: "json"},
98+
{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
9499
}
95100
}
96101
w.Reset()

‎config/configure_list_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ func TestDoConfigureList(t *testing.T) {
3434
return &Configuration{
3535
CurrentProfile: "default",
3636
Profiles: []Profile{
37-
Profile{
37+
{
3838
Name: "default",
3939
Mode: AK,
4040
AccessKeyId: "default_aliyun_access_key_id",
4141
AccessKeySecret: "default_aliyun_access_key_secret",
4242
OutputFormat: "json",
4343
},
44-
Profile{
44+
{
4545
Name: "aaa",
4646
Mode: StsToken,
4747
AccessKeyId: "sdf",
4848
AccessKeySecret: "ddf",
4949
OutputFormat: "json",
5050
StsToken: "StsToken",
5151
},
52-
Profile{
52+
{
5353
Name: "bbb",
5454
Mode: RamRoleArn,
5555
AccessKeyId: "sdf",
@@ -58,15 +58,15 @@ func TestDoConfigureList(t *testing.T) {
5858
RamRoleArn: "RamRoleArn",
5959
RoleSessionName: "RoleSessionName",
6060
},
61-
Profile{
61+
{
6262
Name: "ccc",
6363
Mode: EcsRamRole,
6464
AccessKeyId: "sdf",
6565
AccessKeySecret: "ddf",
6666
OutputFormat: "json",
6767
RamRoleName: "RamRoleName",
6868
},
69-
Profile{
69+
{
7070
Name: "ddd",
7171
Mode: RsaKeyPair,
7272
AccessKeyId: "sdf",

0 commit comments

Comments
 (0)