fix: testcase - common env fix (#980)

Kagashino · web-flow · commit 48a27111de71 · 2022-04-20T23:36:41.000+08:00
diff --git a/tencentcloud/data_source_tc_sqlserver_account_db_attachments_test.go b/tencentcloud/data_source_tc_sqlserver_account_db_attachments_test.go
@@ -11,7 +11,7 @@ var testDataSqlserverAccountDBAttachmentsName = "data.tencentcloud_sqlserver_acc
 func TestAccDataSourceTencentCloudSqlserverAccountDBAttachments(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckLBDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/data_source_tc_sqlserver_accounts_test.go b/tencentcloud/data_source_tc_sqlserver_accounts_test.go
@@ -11,7 +11,7 @@ var testDataSqlserverAccountsName = "data.tencentcloud_sqlserver_accounts.test"
 func TestAccDataSourceTencentCloudSqlserverAccounts(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckLBDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/data_source_tc_sqlserver_backups_test.go b/tencentcloud/data_source_tc_sqlserver_backups_test.go
@@ -15,7 +15,7 @@ var now = time.Now().Format("2006-01-02 15:04:05")
 func TestAccDataSourceTencentCloudSqlserverBackups(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckLBDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/data_source_tc_sqlserver_basic_instances_test.go b/tencentcloud/data_source_tc_sqlserver_basic_instances_test.go
@@ -11,7 +11,7 @@ var testDataSqlserverBasicInstancesName = "data.tencentcloud_sqlserver_basic_ins
 func TestAccDataSourceTencentCloudSqlserverBasicInstances(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverBasicInstanceDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/data_source_tc_sqlserver_dbs_test.go b/tencentcloud/data_source_tc_sqlserver_dbs_test.go
@@ -9,7 +9,7 @@ import (
 func TestAccDataSourceTencentCloudSqlserverDBs_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
diff --git a/tencentcloud/data_source_tc_sqlserver_instances_test.go b/tencentcloud/data_source_tc_sqlserver_instances_test.go
@@ -11,7 +11,7 @@ var testDataSqlserverInstancesName = "data.tencentcloud_sqlserver_instances.test
 func TestAccDataSourceTencentCloudSqlserverInstances(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverInstanceDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/data_source_tc_sqlserver_publish_subscribes_test.go b/tencentcloud/data_source_tc_sqlserver_publish_subscribes_test.go
@@ -9,7 +9,7 @@ import (
 func TestAccTencentCloudSqlserverPublishSubscribeDataSource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverPublishSubscribeDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/data_source_tc_sqlserver_readonly_groups_test.go b/tencentcloud/data_source_tc_sqlserver_readonly_groups_test.go
@@ -11,7 +11,7 @@ var testDataSqlserverReadonlyGroupsName = "data.tencentcloud_sqlserver_readonly_
 func TestAccDataSourceTencentCloudSqlserverReadonlyGroups(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckLBDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/provider_test.go b/tencentcloud/provider_test.go
@@ -57,11 +57,11 @@ 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 == "" {
+	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 == "" {
+	if v := os.Getenv(COMMON_PROVIDER_SECRET_KEY); v != "" {
 		secretKey := os.Getenv(COMMON_PROVIDER_SECRET_KEY)
 		os.Setenv(PROVIDER_SECRET_KEY, secretKey)
 	}
diff --git a/tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go b/tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go
@@ -16,7 +16,7 @@ var testSqlserverAccountDBAttachmentResourceKey = testSqlserverAccountDBAttachme
 func TestAccTencentCloudSqlserverAccountDBAttachmentResource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverAccountDBAttachmentDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/resource_tc_sqlserver_account_test.go b/tencentcloud/resource_tc_sqlserver_account_test.go
@@ -64,7 +64,7 @@ func init() {
 func TestAccTencentCloudSqlserverAccountResource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverAccountDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/resource_tc_sqlserver_basic_instance_test.go b/tencentcloud/resource_tc_sqlserver_basic_instance_test.go
@@ -15,7 +15,7 @@ var testSqlserverBasicInstanceResourceKey = testSqlserverBasicInstanceResourceNa
 func TestAccTencentCloudSqlserverBasicInstanceResource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverBasicInstanceDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/resource_tc_sqlserver_db_test.go b/tencentcloud/resource_tc_sqlserver_db_test.go
@@ -57,7 +57,7 @@ func init() {
 func TestAccTencentCloudSqlserverDB_basic_and_update(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverDBDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/resource_tc_sqlserver_instance_test.go b/tencentcloud/resource_tc_sqlserver_instance_test.go
@@ -148,7 +148,7 @@ func batchDeleteSQLServerInstances(ctx context.Context, service SqlserverService
 func TestAccTencentCloudSqlserverInstanceResource_PostPaid(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverInstanceDestroy,
 		Steps: []resource.TestStep{
@@ -238,7 +238,7 @@ func TestAccTencentCloudSqlserverInstanceResource_Prepaid(t *testing.T) {
 func TestAccTencentCloudSqlserverInstanceMultiClusterResource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverInstanceDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go b/tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go
@@ -13,7 +13,7 @@ import (
 func TestAccTencentCloudSqlserverPublishSubscribeResource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckSqlserverPublishSubscribeDestroy,
 		Steps: []resource.TestStep{
diff --git a/tencentcloud/resource_tc_sqlserver_readonly_instance_test.go b/tencentcloud/resource_tc_sqlserver_readonly_instance_test.go
@@ -15,7 +15,7 @@ var testReadonlySqlserverInstanceResourceKey = testReadonlySqlserverInstanceReso
 func TestAccTencentCloudReadonlySqlserverInstanceResource(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },
+		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckReadonlySqlserverInstanceDestroy,
 		Steps: []resource.TestStep{

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`func TestAccDataSourceTencentCloudSqlserverDBs_basic(t *testing.T) {`
`10`	`10`	`t.Parallel()`
`11`	`11`	`resource.Test(t, resource.TestCase{`
`12`		`- PreCheck: func() { testAccPreCheckCommon(t, ACCOUNT_TYPE_COMMON) },`
	`12`	`+ PreCheck: func() { testAccPreCheck(t) },`
`13`	`13`	`Providers: testAccProviders,`
`14`	`14`	`Steps: []resource.TestStep{`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ func testAccPreCheck(t *testing.T) {`
`57`	`57`	`log.Printf("[INFO] Testing: Using %s as test region", defaultRegion)`
`58`	`58`	`os.Setenv(PROVIDER_REGION, defaultRegion)`
`59`	`59`	`}`
`60`		`- if v := os.Getenv(COMMON_PROVIDER_SECRET_ID); v == "" {`
	`60`	`+ if v := os.Getenv(COMMON_PROVIDER_SECRET_ID); v != "" {`
`61`	`61`	`secretId := os.Getenv(COMMON_PROVIDER_SECRET_ID)`
`62`	`62`	`os.Setenv(PROVIDER_SECRET_ID, secretId)`
`63`	`63`	`}`
`64`		`- if v := os.Getenv(COMMON_PROVIDER_SECRET_KEY); v == "" {`
	`64`	`+ if v := os.Getenv(COMMON_PROVIDER_SECRET_KEY); v != "" {`
`65`	`65`	`secretKey := os.Getenv(COMMON_PROVIDER_SECRET_KEY)`
`66`	`66`	`os.Setenv(PROVIDER_SECRET_KEY, secretKey)`
`67`	`67`	`}`