Skip to content

Commit 2ec6a24

Browse files
authored
fix(provider): [120516339] Adapt to data type for tccli (#2944)
* add * add * add
1 parent ce1c030 commit 2ec6a24

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.changelog/2944.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: Adapt to data type for `tccli`
3+
```

tencentcloud/provider.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,11 +2224,13 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
22242224
region = v.(string)
22252225
}
22262226

2227-
if secretId == "" && secretKey == "" && securityToken == "" && region == "" {
2227+
if secretId == "" && secretKey == "" && securityToken == "" {
22282228
secretId = getProviderConfig("secretId")
22292229
secretKey = getProviderConfig("secretKey")
22302230
securityToken = getProviderConfig("token")
2231-
region = getProviderConfig("region")
2231+
if region == "" {
2232+
region = getProviderConfig("region")
2233+
}
22322234
}
22332235

22342236
if region == "" {
@@ -2564,7 +2566,9 @@ func getConfigFromProfile(d *schema.ResourceData, ProfileKey string) (interface{
25642566
}
25652567

25662568
for k, v := range config {
2567-
providerConfig[k] = strings.TrimSpace(v.(string))
2569+
if strValue, ok := v.(string); ok {
2570+
providerConfig[k] = strings.TrimSpace(strValue)
2571+
}
25682572
}
25692573
}
25702574

0 commit comments

Comments
 (0)