From 1e79fae6cc9877616d35fc17eca54731979de25c Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Mon, 22 Jul 2024 20:04:35 +0800 Subject: [PATCH 1/3] add --- tencentcloud/provider.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go index e66ac94835..565cbb8326 100644 --- a/tencentcloud/provider.go +++ b/tencentcloud/provider.go @@ -1993,17 +1993,6 @@ func Provider() *schema.Provider { } func providerConfigure(d *schema.ResourceData) (interface{}, error) { - //var getProviderConfig = func(str string, key string) string { - // if str == "" { - // value, err := getConfigFromProfile(d, key) - // if err == nil && value != nil { - // str = value.(string) - // } - // } - // - // return str - //} - var getProviderConfig = func(key string) string { var str string value, err := getConfigFromProfile(d, key) @@ -2037,6 +2026,8 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { if v, ok := d.GetOk("security_token"); ok { securityToken = v.(string) + } else { + securityToken = getProviderConfig("securityToken") } if v, ok := d.GetOk("region"); ok { From e3009584f95701ba7150cce37819f3a1b4f07244 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Mon, 22 Jul 2024 20:09:01 +0800 Subject: [PATCH 2/3] add --- .changelog/2739.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2739.txt diff --git a/.changelog/2739.txt b/.changelog/2739.txt new file mode 100644 index 0000000000..44bd776f49 --- /dev/null +++ b/.changelog/2739.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +provider: support securityToken for credentials +``` From 96d13b5ed3c44bed1c420a0e9229d0bf464911c2 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Mon, 22 Jul 2024 20:17:40 +0800 Subject: [PATCH 3/3] add --- tencentcloud/provider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go index 565cbb8326..eae106adc5 100644 --- a/tencentcloud/provider.go +++ b/tencentcloud/provider.go @@ -2027,7 +2027,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { if v, ok := d.GetOk("security_token"); ok { securityToken = v.(string) } else { - securityToken = getProviderConfig("securityToken") + securityToken = getProviderConfig("token") } if v, ok := d.GetOk("region"); ok {