fix: cam/sqlserver/tcr testcases (#1084)

Author: Kagashino

tencentcloud/data_source_tc_cam_saml_providers_test.go

@@ -6,6 +6,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
+const testAccSAMLProviderDataSourceName = "cam-provider-test1"
+
 func TestAccTencentCloudCamSAMLProvidersDataSource_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
@@ -18,7 +20,7 @@ func TestAccTencentCloudCamSAMLProvidersDataSource_basic(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckCamSAMLProviderExists("tencentcloud_cam_saml_provider.provider"),
 					resource.TestCheckResourceAttr("data.tencentcloud_cam_saml_providers.saml_providers", "provider_list.#", "1"),
-					resource.TestCheckResourceAttr("data.tencentcloud_cam_saml_providers.saml_providers", "provider_list.0.name", "cam-provider-test1"),
+					resource.TestCheckResourceAttr("data.tencentcloud_cam_saml_providers.saml_providers", "provider_list.0.name", testAccSAMLProviderDataSourceName),
 					resource.TestCheckResourceAttr("data.tencentcloud_cam_saml_providers.saml_providers", "provider_list.0.description", "test"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_cam_saml_providers.saml_providers", "provider_list.0.create_time"),
 					resource.TestCheckResourceAttrSet("data.tencentcloud_cam_saml_providers.saml_providers", "provider_list.0.modify_time"),
@@ -30,7 +32,7 @@ func TestAccTencentCloudCamSAMLProvidersDataSource_basic(t *testing.T) {
 
 const testAccCamSAMLProvidersDataSource_basic = `
 resource "tencentcloud_cam_saml_provider" "provider" {
-  name        = "cam-provider-test1"
+  name        = "` + testAccSAMLProviderDataSourceName + `"
   meta_data   = "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48bWQ6RW50aXR5RGVzY3JpcHRvciBlbnRpdHlJRD0iaHR0cDovL3d3dy5va3RhLmNvbS9leGsxa3F4bWNqUW1HQURNeTM1NyIgeG1sbnM6bWQ9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDptZXRhZGF0YSI+PG1kOklEUFNTT0Rlc2NyaXB0b3IgV2FudEF1dGhuUmVxdWVzdHNTaWduZWQ9ImZhbHNlIiBwcm90b2NvbFN1cHBvcnRFbnVtZXJhdGlvbj0idXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnByb3RvY29sIj48bWQ6S2V5RGVzY3JpcHRvciB1c2U9InNpZ25pbmciPjxkczpLZXlJbmZvIHhtbG5zOmRzPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwLzA5L3htbGRzaWcjIj48ZHM6WDUwOURhdGE+PGRzOlg1MDlDZXJ0aWZpY2F0ZT5NSUlEb0RDQ0FvaWdBd0lCQWdJR0FXM0lTcExvTUEwR0NTcUdTSWIzRFFFQkN3VUFNSUdRTVFzd0NRWURWUVFHRXdKVlV6RVRNQkVHDQpBMVVFQ0F3S1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ3d05VMkZ1SUVaeVlXNWphWE5qYnpFTk1Bc0dBMVVFQ2d3RVQydDBZVEVVDQpNQklHQTFVRUN3d0xVMU5QVUhKdmRtbGtaWEl4RVRBUEJnTlZCQU1NQ0dsa2VIVmxkblJoTVJ3d0dnWUpLb1pJaHZjTkFRa0JGZzFwDQpibVp2UUc5cmRHRXVZMjl0TUI0WERURTVNVEF4TkRBek1qSXhNMW9YRFRJNU1UQXhOREF6TWpNeE0xb3dnWkF4Q3pBSkJnTlZCQVlUDQpBbFZUTVJNd0VRWURWUVFJREFwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSERBMVRZVzRnUm5KaGJtTnBjMk52TVEwd0N3WURWUVFLDQpEQVJQYTNSaE1SUXdFZ1lEVlFRTERBdFRVMDlRY205MmFXUmxjakVSTUE4R0ExVUVBd3dJYVdSNGRXVjJkR0V4SERBYUJna3Foa2lHDQo5dzBCQ1FFV0RXbHVabTlBYjJ0MFlTNWpiMjB3Z2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ2g4b3dqDQpZK2dQSUM3blQvNTduLzdmeXJzcDlHMXdxa2UxdXhjMHVrTndnQXozOVNpelY3QVhLMWRReTFLaThXWjJJMzFEczJkT0FNQ1FKR2pWDQpUWWNNbnA3KzhqUzNLdmxNUkRJamk5cmxuUi9vcnBvMll1RHVWby9jVzdidlRIS2h2REo1QWZRaWxzYlNPTXdUOWM2TVlYZGhBNVBwDQpzelFsK1UrdHJmcXUrdUorSER4SVQxdlhWaVI5YlY2SUFRSzZpbWZoc2wxWmVSUytjbVFVNEpjQWlYT0xtTnFVVWM2UkpxUzhrMW1mDQpBLzhmb2VyMGc3SG4xZDVXclpCc2gyUlR2Vzh1ZVdadHQ3dmh4QTlGdE5kSVlEcXJ0eElmMlZXcXhrSHM3WFZDSm5wTnJITVovT1BRDQpGY21YSGVxNlJJMlB3Q1RlOW8zZHZpM0hqeXBaOEl4dkFnTUJBQUV3RFFZSktvWklodmNOQVFFTEJRQURnZ0VCQUFHaHk1bG9nbGtTDQoyVHg2YS90MnF5VEx0YVV5cEwrNGhySGJoMVAweVVMc0NrSnFsM2wrWG9VZDZCY2FJaFNSVGFPQk95ODViL0UzelJ4K3JzQXJwTjVVDQp5ZThuUEM4a05PYW5vTk9wWnZvYmhpTzFlMFIvYmxEcnRBL0o5UlBwMWtmdlhmS2NSTTU3TlRCWXppTURlbnFQUTRFOWN1U2lGdFFxDQpJYmpIbThaM1B1YXgwRitldkZ3U1pJMDNCWXNISGw1d1EraEJBS3hTdTJINEZRdU93Zmpnb2EveEN6Z1NKYjJ2UXdEc1MxMk9mSkNiDQpSRm1ZL1VYZXQramFhdEVORktLZStZSUJpU0J2WG1adTN0MHN5NDZTNzlPVzBacXJ0NUh2bElsT2lpTFpaN1FZamxjM1kxeG1LZ1luDQpXM2M2WGZkdmhGWHo0ZDdkbWYvTUdpNGY0enM9PC9kczpYNTA5Q2VydGlmaWNhdGU+PC9kczpYNTA5RGF0YT48L2RzOktleUluZm8+PC9tZDpLZXlEZXNjcmlwdG9yPjxtZDpOYW1lSURGb3JtYXQ+dXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6MS4xOm5hbWVpZC1mb3JtYXQ6dW5zcGVjaWZpZWQ8L21kOk5hbWVJREZvcm1hdD48bWQ6TmFtZUlERm9ybWF0PnVybjpvYXNpczpuYW1lczp0YzpTQU1MOjEuMTpuYW1laWQtZm9ybWF0OmVtYWlsQWRkcmVzczwvbWQ6TmFtZUlERm9ybWF0PjxtZDpTaW5nbGVTaWduT25TZXJ2aWNlIEJpbmRpbmc9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDpiaW5kaW5nczpIVFRQLVBPU1QiIExvY2F0aW9uPSJodHRwczovL2lkeHVldnRhLm9rdGEuY29tL2FwcC9pZHh1ZW9yZzYzNzM1OF90ZXN0XzEvZXhrMWtxeG1jalFtR0FETXkzNTcvc3NvL3NhbWwiLz48bWQ6U2luZ2xlU2lnbk9uU2VydmljZSBCaW5kaW5nPSJ1cm46b2FzaXM6bmFtZXM6dGM6U0FNTDoyLjA6YmluZGluZ3M6SFRUUC1SZWRpcmVjdCIgTG9jYXRpb249Imh0dHBzOi8vaWR4dWV2dGEub2t0YS5jb20vYXBwL2lkeHVlb3JnNjM3MzU4X3Rlc3RfMS9leGsxa3F4bWNqUW1HQURNeTM1Ny9zc28vc2FtbCIvPjwvbWQ6SURQU1NPRGVzY3JpcHRvcj48L21kOkVudGl0eURlc2NyaXB0b3I+"
   description = "test"
 }

tencentcloud/data_source_tc_sqlserver_account_db_attachments_test.go

@@ -28,10 +28,12 @@ func TestAccDataSourceTencentCloudSqlserverAccountDBAttachments(t *testing.T) {
 	})
 }
 
+const testAccSQLServerAttachDataDB = "test_db_attachment"
+
 const testAccTencentCloudDataSqlserverAccountDBAttachmentsBasic = CommonPresetSQLServerAccount + `
 resource "tencentcloud_sqlserver_db" "test" {
   instance_id = local.sqlserver_id
-  name        = "test_db_attachment"
+  name        = "` + testAccSQLServerAttachDataDB + `"
   charset     = "Chinese_PRC_BIN"
   remark      = "testACC-remark"
 }

tencentcloud/resource_tc_cam_saml_provider_test.go

@@ -3,6 +3,7 @@ package tencentcloud
 import (
 	"context"
 	"fmt"
+	"log"
 	"testing"
 
 	cam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam/v20190116"
@@ -19,22 +20,29 @@ func init() {
 	resource.AddTestSweepers("tencentcloud_cam_saml_provider", &resource.Sweeper{
 		Name: "tencentcloud_cam_saml_provider",
 		F: func(r string) error {
-			cli, _ := sharedClientForRegion(r)
-			client := cli.(*TencentCloudClient).apiV3Conn
 
-			request := cam.NewDeleteSAMLProviderRequest()
-			request.Name = helper.String(testAccCamSAMLName)
-
-			_, err := client.UseCamClient().DeleteSAMLProvider(request)
-			if err != nil {
-				return err
+			if err := testAccDeleteSAMLProvider(r, testAccCamSAMLName); err != nil {
+				log.Printf("Delete SAML Provider %s fail, reason: %s", testAccCamSAMLName, err.Error())
+			}
+			if err := testAccDeleteSAMLProvider(r, testAccSAMLProviderDataSourceName); err != nil {
+				log.Printf("Delete SAML Provider %s fail, reason: %s", testAccSAMLProviderDataSourceName, err.Error())
 			}
-
 			return nil
 		},
 	})
 }
 
+func testAccDeleteSAMLProvider(region string, name string) error {
+	cli, _ := sharedClientForRegion(region)
+	client := cli.(*TencentCloudClient).apiV3Conn
+
+	request := cam.NewDeleteSAMLProviderRequest()
+	request.Name = helper.String(name)
+
+	_, err := client.UseCamClient().DeleteSAMLProvider(request)
+	return err
+}
+
 func TestAccTencentCloudCamSAMLProvider_basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{

tencentcloud/resource_tc_sqlserver_db_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
@@ -51,7 +52,7 @@ func init() {
 
 			for i := range dbs {
 				db := dbs[i]
-				if *db.Name != testDbName {
+				if !strings.HasPrefix(*db.Name, "test") {
 					continue
 				}
 				err := service.DeleteSqlserverDB(ctx, insId, []*string{db.Name})

tencentcloud/resource_tc_tcr_vpc_attachment.go

@@ -38,7 +38,11 @@ func resourceTencentCloudTcrVpcAttachment() *schema.Resource {
 		Update: resourceTencentCloudTcrVpcAttachmentUpdate,
 		Delete: resourceTencentCLoudTcrVpcAttachmentDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: func(d *schema.ResourceData, i interface{}) ([]*schema.ResourceData, error) {
+				_ = d.Set("enable_public_domain_dns", false)
+				_ = d.Set("enable_vpc_domain_dns", false)
+				return []*schema.ResourceData{d}, nil
+			},
 		},
 
 		Schema: map[string]*schema.Schema{