Skip to content

Commit 3010ef8

Browse files
authored
fix(provider): [123456789] Update auth (#2887)
* add * add
1 parent 01ec1df commit 3010ef8

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.changelog/2887.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
provider/Update auth
3+
```

tencentcloud/provider.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,29 +2197,29 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
21972197
needSecret := true
21982198
if v, ok := d.GetOk("secret_id"); ok {
21992199
secretId = v.(string)
2200-
} else {
2201-
secretId = getProviderConfig("secretId")
22022200
}
22032201

22042202
if v, ok := d.GetOk("secret_key"); ok {
22052203
secretKey = v.(string)
2206-
} else {
2207-
secretKey = getProviderConfig("secretKey")
22082204
}
22092205

22102206
if v, ok := d.GetOk("security_token"); ok {
22112207
securityToken = v.(string)
2212-
} else {
2213-
securityToken = getProviderConfig("token")
22142208
}
22152209

22162210
if v, ok := d.GetOk("region"); ok {
22172211
region = v.(string)
2218-
} else {
2212+
}
2213+
2214+
if secretId == "" && secretKey == "" && securityToken == "" && region == "" {
2215+
secretId = getProviderConfig("secretId")
2216+
secretKey = getProviderConfig("secretKey")
2217+
securityToken = getProviderConfig("token")
22192218
region = getProviderConfig("region")
2220-
if region == "" {
2221-
region = DEFAULT_REGION
2222-
}
2219+
}
2220+
2221+
if region == "" {
2222+
region = DEFAULT_REGION
22232223
}
22242224

22252225
if v, ok := d.GetOk("protocol"); ok {

0 commit comments

Comments
 (0)