Skip to content

Commit 418b666

Browse files
authored
add: environment variables (#276)
1 parent 795a15c commit 418b666

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
### Master
44

5+
- add: environment variables
6+
`ALIBABACLOUD_ACCESS_KEY_ID`, `ALICLOUD_ACCESS_KEY_ID`, `ALIBABACLOUD_ACCESS_KEY_SECRET`, `ALICLOUD_ACCESS_KEY_SECRET`
57
- fix: cancel HTML character escaping
68

79
### 3.0.39

config/profile.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,25 @@ func (cp *Profile) OverwriteWithFlags(ctx *cli.Context) {
146146
cp.ExpiredSeconds = ExpiredSecondsFlag(ctx.Flags()).GetIntegerOrDefault(cp.ExpiredSeconds)
147147

148148
if cp.AccessKeyId == "" {
149-
cp.AccessKeyId = os.Getenv("ACCESS_KEY_ID")
149+
switch {
150+
case os.Getenv("ALIBABACLOUD_ACCESS_KEY_ID") != "":
151+
cp.AccessKeyId = os.Getenv("ALIBABACLOUD_ACCESS_KEY_ID")
152+
case os.Getenv("ALICLOUD_ACCESS_KEY_ID") != "":
153+
cp.AccessKeyId = os.Getenv("ALICLOUD_ACCESS_KEY_ID")
154+
case os.Getenv("ACCESS_KEY_ID") != "":
155+
cp.AccessKeyId = os.Getenv("ACCESS_KEY_ID")
156+
}
150157
}
151158

152159
if cp.AccessKeySecret == "" {
153-
cp.AccessKeySecret = os.Getenv("ACCESS_KEY_SECRET")
160+
switch {
161+
case os.Getenv("ALIBABACLOUD_ACCESS_KEY_SECRET") != "":
162+
cp.AccessKeyId = os.Getenv("ALIBABACLOUD_ACCESS_KEY_SECRET")
163+
case os.Getenv("ALICLOUD_ACCESS_KEY_SECRET") != "":
164+
cp.AccessKeyId = os.Getenv("ALICLOUD_ACCESS_KEY_SECRET")
165+
case os.Getenv("ACCESS_KEY_SECRET") != "":
166+
cp.AccessKeyId = os.Getenv("ACCESS_KEY_SECRET")
167+
}
154168
}
155169

156170
if cp.StsToken == "" {

0 commit comments

Comments
 (0)