Skip to content

Commit 8a7ad9d

Browse files
JacksonTianJacksonTian
authored
Merge branch 'master' into vpc
2 parents 7e0991f + a91d3ad commit 8a7ad9d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1674
-37
lines changed

‎.github/workflows/go.yml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Go
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
11+
build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
# fetch submodule for aliyun-openapi-meta
16+
- run: git submodule update --init --recursive
17+
18+
- name: Set up Go
19+
uses: actions/setup-go@v2
20+
with:
21+
go-version: 1.16
22+
23+
- name: Build
24+
run: make build
25+
26+
- name: Test
27+
run: go vet ./cli/... ./config/... ./i18n/... ./main/... ./openapi/... ./oss/... ./resource/...
28+
- run: go test -race -coverprofile=coverage.txt -covermode=atomic ./cli/... ./config/... ./i18n/... ./meta/... ./main/... ./openapi/... ./resource/...
29+
- run: test -z $ACCESS_KEY_ID -a -z $ACCESS_KEY_SECRET || bash ./integration/ecs_test

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ English | [简体中文](./README-CN.md)
33
<h1 align="center">Alibaba Cloud CLI</h1>
44

55
<p align="center">
6-
<a href="https://travis-ci.com/aliyun/aliyun-cli"><img src="https://travis-ci.com/aliyun/aliyun-cli.svg?branch=master" alt="Travis Build Status"></a>
6+
<a href="https://github.com/aliyun/aliyun-cli/actions/workflows/go.yml"><img src="https://github.com/aliyun/aliyun-cli/actions/workflows/go.yml/badge.svg" alt="Go build Status"></a>
77
<a href="https://ci.appveyor.com/project/aliyun/aliyun-cli"><img src="https://ci.appveyor.com/api/projects/status/avxoqqcmgksbt3d8/branch/master?svg=true" alt="Appveyor Build Status"></a>
88
<a href="https://codecov.io/gh/aliyun/aliyun-cli"><img src="https://codecov.io/gh/aliyun/aliyun-cli/branch/master/graph/badge.svg" alt="codecov"></a>
99
<a href="https://github.com/aliyun/aliyun-cli/blob/master/LICENSE"><img src="https://img.shields.io/github/license/aliyun/aliyun-cli.svg" alt="License"></a>

‎config/legacy.go

+8-4
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@ func MigrateLegacyConfiguration() (conf *Configuration, err error) {
2727
return
2828
}
2929

30-
conf, err = MigrateCredentials(path)
31-
if err != nil {
30+
conf, migrateErr := MigrateCredentials(path)
31+
if migrateErr != nil {
3232
return
3333
}
3434

3535
path = hookGetHomePath(GetHomePath)() + "/.aliyuncli/configure"
36-
err = MigrateConfigure(path, conf)
36+
mfErr := MigrateConfigure(path, conf)
37+
if mfErr != nil {
38+
return
39+
}
40+
3741
return
3842
}
3943

@@ -97,5 +101,5 @@ func MigrateConfigure(path string, conf *Configuration) (err error) {
97101
}
98102
}
99103

100-
return
104+
return nil
101105
}

‎config/legacy_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ func TestMigrateConfigure(t *testing.T) {
6262
conf := &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"}}}
6363
err := MigrateConfigure("http://nici", conf)
6464
if runtime.GOOS == "windows" {
65-
assert.Equal(t, "parse failed: open http://nici: The filename, directory name, or volume label syntax is incorrect.", err.Error())
65+
assert.Equal(t, "parse failed: open http://nici: The filename, directory name, or volume label syntax is incorrect.\n", err.Error())
6666
} else {
67-
assert.Equal(t, "parse failed: open http://nici: no such file or directory", err.Error())
67+
assert.Equal(t, "parse failed: open http://nici: no such file or directory\n", err.Error())
6868
}
6969

7070
test, err := os.Create("testconf.ini")
@@ -101,11 +101,13 @@ func TestMigrateLegacyConfiguration(t *testing.T) {
101101
os.RemoveAll("./.aliyuncli")
102102
hookGetHomePath = orighookGetHomePath
103103
}()
104+
104105
hookGetHomePath = func(fn func() string) func() string {
105106
return func() string {
106107
return "."
107108
}
108109
}
110+
109111
err := os.Mkdir("./.aliyuncli", os.ModePerm)
110112
assert.Nil(t, err)
111113

@@ -126,5 +128,5 @@ func TestMigrateLegacyConfiguration(t *testing.T) {
126128
test.Close()
127129
conf, err := MigrateLegacyConfiguration()
128130
assert.Nil(t, err)
129-
assert.Nil(t, conf)
131+
assert.NotNil(t, conf)
130132
}

‎oss/lib/allpart_size.go

+8
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,14 @@ var allPartSizeCommand = AllPartSizeCommand{
9595
OptionEncodingType,
9696
OptionLogLevel,
9797
OptionPassword,
98+
OptionMode,
99+
OptionECSRoleName,
100+
OptionTokenTimeout,
101+
OptionRamRoleArn,
102+
OptionRoleSessionName,
103+
OptionReadTimeout,
104+
OptionConnectTimeout,
105+
OptionSTSRegion,
98106
},
99107
},
100108
}

‎oss/lib/append_file.go

+8
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,14 @@ var appendFileCommand = AppendFileCommand{
150150
OptionLogLevel,
151151
OptionRequestPayer,
152152
OptionPassword,
153+
OptionMode,
154+
OptionECSRoleName,
155+
OptionTokenTimeout,
156+
OptionRamRoleArn,
157+
OptionRoleSessionName,
158+
OptionReadTimeout,
159+
OptionConnectTimeout,
160+
OptionSTSRegion,
153161
},
154162
},
155163
}

‎oss/lib/bucket_cors.go

+8
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,14 @@ var corsCommand = CorsCommand{
146146
OptionMethod,
147147
OptionLogLevel,
148148
OptionPassword,
149+
OptionMode,
150+
OptionECSRoleName,
151+
OptionTokenTimeout,
152+
OptionRamRoleArn,
153+
OptionRoleSessionName,
154+
OptionReadTimeout,
155+
OptionConnectTimeout,
156+
OptionSTSRegion,
149157
},
150158
},
151159
}

‎oss/lib/bucket_encryption.go

+8
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@ var bucketEncryptionCommand = BucketEncryptionCommand{
135135
OptionKMSMasterKeyID,
136136
OptionKMSDataEncryption,
137137
OptionPassword,
138+
OptionMode,
139+
OptionECSRoleName,
140+
OptionTokenTimeout,
141+
OptionRamRoleArn,
142+
OptionRoleSessionName,
143+
OptionReadTimeout,
144+
OptionConnectTimeout,
145+
OptionSTSRegion,
138146
},
139147
},
140148
}

‎oss/lib/bucket_inventory.go

+8
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,14 @@ var bucketInventoryCommand = BucketInventoryCommand{
207207
OptionMethod,
208208
OptionMarker,
209209
OptionPassword,
210+
OptionMode,
211+
OptionECSRoleName,
212+
OptionTokenTimeout,
213+
OptionRamRoleArn,
214+
OptionRoleSessionName,
215+
OptionReadTimeout,
216+
OptionConnectTimeout,
217+
OptionSTSRegion,
210218
},
211219
},
212220
}

‎oss/lib/bucket_lifecycle.go

+8
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,14 @@ var bucketLifeCycleCommand = BucketLifeCycleCommand{
165165
OptionLogLevel,
166166
OptionMethod,
167167
OptionPassword,
168+
OptionMode,
169+
OptionECSRoleName,
170+
OptionTokenTimeout,
171+
OptionRamRoleArn,
172+
OptionRoleSessionName,
173+
OptionReadTimeout,
174+
OptionConnectTimeout,
175+
OptionSTSRegion,
168176
},
169177
},
170178
}

‎oss/lib/bucket_logging.go

+8
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,14 @@ var bucketLogCommand = BucketLogCommand{
125125
OptionMethod,
126126
OptionLogLevel,
127127
OptionPassword,
128+
OptionMode,
129+
OptionECSRoleName,
130+
OptionTokenTimeout,
131+
OptionRamRoleArn,
132+
OptionRoleSessionName,
133+
OptionReadTimeout,
134+
OptionConnectTimeout,
135+
OptionSTSRegion,
128136
},
129137
},
130138
}

‎oss/lib/bucket_policy.go

+8
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,14 @@ var bucketPolicyCommand = BucketPolicyCommand{
162162
OptionLogLevel,
163163
OptionMethod,
164164
OptionPassword,
165+
OptionMode,
166+
OptionECSRoleName,
167+
OptionTokenTimeout,
168+
OptionRamRoleArn,
169+
OptionRoleSessionName,
170+
OptionReadTimeout,
171+
OptionConnectTimeout,
172+
OptionSTSRegion,
165173
},
166174
},
167175
}

‎oss/lib/bucket_qos.go

+8
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,14 @@ var bucketQosCommand = BucketQosCommand{
151151
OptionLogLevel,
152152
OptionMethod,
153153
OptionPassword,
154+
OptionMode,
155+
OptionECSRoleName,
156+
OptionTokenTimeout,
157+
OptionRamRoleArn,
158+
OptionRoleSessionName,
159+
OptionReadTimeout,
160+
OptionConnectTimeout,
161+
OptionSTSRegion,
154162
},
155163
},
156164
}

‎oss/lib/bucket_referer.go

+8
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@ var bucketRefererCommand = BucketRefererCommand{
131131
OptionDisableEmptyReferer,
132132
OptionMethod,
133133
OptionPassword,
134+
OptionMode,
135+
OptionECSRoleName,
136+
OptionTokenTimeout,
137+
OptionRamRoleArn,
138+
OptionRoleSessionName,
139+
OptionReadTimeout,
140+
OptionConnectTimeout,
141+
OptionSTSRegion,
134142
},
135143
},
136144
}

‎oss/lib/bucket_tagging.go

+8
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ var bucketTagCommand = BucketTagCommand{
115115
OptionMethod,
116116
OptionLogLevel,
117117
OptionPassword,
118+
OptionMode,
119+
OptionECSRoleName,
120+
OptionTokenTimeout,
121+
OptionRamRoleArn,
122+
OptionRoleSessionName,
123+
OptionReadTimeout,
124+
OptionConnectTimeout,
125+
OptionSTSRegion,
118126
},
119127
},
120128
}

‎oss/lib/bucket_versioning.go

+8
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@ var bucketVersioningCommand = BucketVersioningCommand{
107107
OptionMethod,
108108
OptionLogLevel,
109109
OptionPassword,
110+
OptionMode,
111+
OptionECSRoleName,
112+
OptionTokenTimeout,
113+
OptionRamRoleArn,
114+
OptionRoleSessionName,
115+
OptionReadTimeout,
116+
OptionConnectTimeout,
117+
OptionSTSRegion,
110118
},
111119
},
112120
}

‎oss/lib/bucket_website.go

+8
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,14 @@ var bucketWebsiteCommand = BucketWebSiteCommand{
238238
OptionLogLevel,
239239
OptionMethod,
240240
OptionPassword,
241+
OptionMode,
242+
OptionECSRoleName,
243+
OptionTokenTimeout,
244+
OptionRamRoleArn,
245+
OptionRoleSessionName,
246+
OptionReadTimeout,
247+
OptionConnectTimeout,
248+
OptionSTSRegion,
241249
},
242250
},
243251
}

‎oss/lib/bucket_worm.go

+8
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,14 @@ var wormCommand = WormCommand{
118118
OptionProxyPwd,
119119
OptionLogLevel,
120120
OptionPassword,
121+
OptionMode,
122+
OptionECSRoleName,
123+
OptionTokenTimeout,
124+
OptionRamRoleArn,
125+
OptionRoleSessionName,
126+
OptionReadTimeout,
127+
OptionConnectTimeout,
128+
OptionSTSRegion,
121129
},
122130
},
123131
}

‎oss/lib/cat.go

+8
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ var catCommand = CatCommand{
103103
OptionVersionId,
104104
OptionRequestPayer,
105105
OptionPassword,
106+
OptionMode,
107+
OptionECSRoleName,
108+
OptionTokenTimeout,
109+
OptionRamRoleArn,
110+
OptionRoleSessionName,
111+
OptionReadTimeout,
112+
OptionConnectTimeout,
113+
OptionSTSRegion,
106114
},
107115
},
108116
}

0 commit comments

Comments
 (0)