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..4be98d3ec8 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" + COMMON_PROVIDER_SECRET_ID = "TENCENTCLOUD_SECRET_ID_COMMON" + COMMON_PROVIDER_SECRET_KEY = "TENCENTCLOUD_SECRET_KEY_COMMON" +) + func init() { testAccProvider = Provider().(*schema.Provider) testAccProviders = map[string]terraform.ResourceProvider{ @@ -42,6 +57,14 @@ func testAccPreCheck(t *testing.T) { log.Printf("[INFO] Testing: Using %s as test region", defaultRegion) os.Setenv(PROVIDER_REGION, defaultRegion) } + 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(COMMON_PROVIDER_SECRET_KEY); v == "" { + secretKey := os.Getenv(COMMON_PROVIDER_SECRET_KEY) + os.Setenv(PROVIDER_SECRET_KEY, secretKey) + } } func testAccPreCheckCommon(t *testing.T, accountType string) {