From ac9d312e01170b5a8aee70d0b2eac2bb36056d68 Mon Sep 17 00:00:00 2001 From: hellertang Date: Wed, 20 Apr 2022 12:58:37 +0800 Subject: [PATCH 1/2] support multi account test --- tencentcloud/provider.go | 10 ---------- tencentcloud/provider_test.go | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go index e616e89abc..3118bbff34 100644 --- a/tencentcloud/provider.go +++ b/tencentcloud/provider.go @@ -636,16 +636,6 @@ const ( PROVIDER_ASSUME_ROLE_ARN = "TENCENTCLOUD_ASSUME_ROLE_ARN" PROVIDER_ASSUME_ROLE_SESSION_NAME = "TENCENTCLOUD_ASSUME_ROLE_SESSION_NAME" PROVIDER_ASSUME_ROLE_SESSION_DURATION = "TENCENTCLOUD_ASSUME_ROLE_SESSION_DURATION" - ACCOUNT_TYPE_INTERNATION = "INTERNATION" - ACCOUNT_TYPE_PREPAY = "PREPAY" - ACCOUNT_TYPE_COMMON = "COMMON" - ACCOUNT_TYPE_PRIVATE = "PRIVATE" - INTERNATION_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_INTERNATION" - INTERNATION_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_INTERNATION" - PREPAY_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_PREPAY" - PREPAY_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_PREPAY" - PRIVATE_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_PRIVATE" - PRIVATE_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_PRIVATE" ) type TencentCloudClient struct { diff --git a/tencentcloud/provider_test.go b/tencentcloud/provider_test.go index 368a056a4f..193a61651d 100644 --- a/tencentcloud/provider_test.go +++ b/tencentcloud/provider_test.go @@ -14,6 +14,21 @@ import ( var testAccProviders map[string]terraform.ResourceProvider var testAccProvider *schema.Provider +const ( + ACCOUNT_TYPE_INTERNATION = "INTERNATION" + ACCOUNT_TYPE_PREPAY = "PREPAY" + ACCOUNT_TYPE_COMMON = "COMMON" + ACCOUNT_TYPE_PRIVATE = "PRIVATE" + INTERNATION_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_INTERNATION" + INTERNATION_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_INTERNATION" + PREPAY_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_PREPAY" + PREPAY_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_PREPAY" + PRIVATE_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_PRIVATE" + PRIVATE_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_PRIVATE" + LOCK_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_LOCK" + LOCK_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_LOCK" +) + func init() { testAccProvider = Provider().(*schema.Provider) testAccProviders = map[string]terraform.ResourceProvider{ @@ -42,6 +57,16 @@ func testAccPreCheck(t *testing.T) { log.Printf("[INFO] Testing: Using %s as test region", defaultRegion) os.Setenv(PROVIDER_REGION, defaultRegion) } + if v := os.Getenv(LOCK_PROVIDER_SECRET_ID); v == "" { + log.Printf("[INFO] Testing: Using %s as test region", defaultRegion) + secretId := os.Getenv(LOCK_PROVIDER_SECRET_ID) + os.Setenv(PROVIDER_SECRET_ID, secretId) + } + if v := os.Getenv(LOCK_PROVIDER_SECRET_ID); v == "" { + log.Printf("[INFO] Testing: Using %s as test region", defaultRegion) + secretKey := os.Getenv(LOCK_PROVIDER_SECRET_KEY) + os.Setenv(PROVIDER_SECRET_KEY, secretKey) + } } func testAccPreCheckCommon(t *testing.T, accountType string) { From 4733c4ddea9275d25c9ca7f11d2c5362a35a39f0 Mon Sep 17 00:00:00 2001 From: Kagashino Date: Wed, 20 Apr 2022 14:48:25 +0800 Subject: [PATCH 2/2] fix: env ref mismatch --- tencentcloud/provider_test.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tencentcloud/provider_test.go b/tencentcloud/provider_test.go index 193a61651d..4be98d3ec8 100644 --- a/tencentcloud/provider_test.go +++ b/tencentcloud/provider_test.go @@ -25,8 +25,8 @@ const ( PREPAY_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_PREPAY" PRIVATE_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_PRIVATE" PRIVATE_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_PRIVATE" - LOCK_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_LOCK" - LOCK_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_LOCK" + COMMON_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_COMMON" + COMMON_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_COMMON" ) func init() { @@ -57,14 +57,12 @@ func testAccPreCheck(t *testing.T) { log.Printf("[INFO] Testing: Using %s as test region", defaultRegion) os.Setenv(PROVIDER_REGION, defaultRegion) } - if v := os.Getenv(LOCK_PROVIDER_SECRET_ID); v == "" { - log.Printf("[INFO] Testing: Using %s as test region", defaultRegion) - secretId := os.Getenv(LOCK_PROVIDER_SECRET_ID) + if v := os.Getenv(COMMON_PROVIDER_SECRET_ID); v == "" { + secretId := os.Getenv(COMMON_PROVIDER_SECRET_ID) os.Setenv(PROVIDER_SECRET_ID, secretId) } - if v := os.Getenv(LOCK_PROVIDER_SECRET_ID); v == "" { - log.Printf("[INFO] Testing: Using %s as test region", defaultRegion) - secretKey := os.Getenv(LOCK_PROVIDER_SECRET_KEY) + if v := os.Getenv(COMMON_PROVIDER_SECRET_KEY); v == "" { + secretKey := os.Getenv(COMMON_PROVIDER_SECRET_KEY) os.Setenv(PROVIDER_SECRET_KEY, secretKey) } }