From 03c2f5814ff3fca89d79f8e4aeb9010faa382285 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Sat, 12 Oct 2024 16:00:46 +0800 Subject: [PATCH 1/2] add --- tencentcloud/provider.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go index fb426a141d..f8fc55ac54 100644 --- a/tencentcloud/provider.go +++ b/tencentcloud/provider.go @@ -2182,29 +2182,29 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { needSecret := true if v, ok := d.GetOk("secret_id"); ok { secretId = v.(string) - } else { - secretId = getProviderConfig("secretId") } if v, ok := d.GetOk("secret_key"); ok { secretKey = v.(string) - } else { - secretKey = getProviderConfig("secretKey") } if v, ok := d.GetOk("security_token"); ok { securityToken = v.(string) - } else { - securityToken = getProviderConfig("token") } if v, ok := d.GetOk("region"); ok { region = v.(string) - } else { + } + + if secretId == "" && secretKey == "" && securityToken == "" && region == "" { + secretId = getProviderConfig("secretId") + secretKey = getProviderConfig("secretKey") + securityToken = getProviderConfig("token") region = getProviderConfig("region") - if region == "" { - region = DEFAULT_REGION - } + } + + if region == "" { + region = DEFAULT_REGION } if v, ok := d.GetOk("protocol"); ok { From 7ec9fc6f2c0f86c944a6517ab2bece9eb18c6f46 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Sat, 12 Oct 2024 16:02:26 +0800 Subject: [PATCH 2/2] add --- .changelog/2887.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2887.txt diff --git a/.changelog/2887.txt b/.changelog/2887.txt new file mode 100644 index 0000000000..55a924bfce --- /dev/null +++ b/.changelog/2887.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +provider/Update auth +``` \ No newline at end of file