Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions tencentcloud/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
23 changes: 23 additions & 0 deletions tencentcloud/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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) {
Expand Down