From 8b717d0300f421e5fa8116f253bd4bc8d03a09ee Mon Sep 17 00:00:00 2001 From: KGSN Date: Wed, 29 Dec 2021 17:00:01 +0800 Subject: [PATCH 1/2] fix: partial cases - sqlserver,cos,tcaplus --- .../data_source_tc_sqlserver_basic_instances_test.go | 2 +- tencentcloud/data_source_tc_tcaplus_clusters_test.go | 2 +- tencentcloud/data_source_tc_tcaplus_idls_test.go | 2 +- .../data_source_tc_tcaplus_tablegroups_test.go | 2 +- tencentcloud/data_source_tc_tcaplus_tables_test.go | 2 +- tencentcloud/resource_tc_cos_bucket_test.go | 10 +++++----- .../resource_tc_sqlserver_basic_instance_test.go | 4 ++-- tencentcloud/resource_tc_sqlserver_instance_test.go | 10 +++++----- tencentcloud/resource_tc_tcaplus_cluster_test.go | 2 +- tencentcloud/resource_tc_tcaplus_idl_test.go | 2 +- tencentcloud/resource_tc_tcaplus_table_test.go | 2 +- tencentcloud/resource_tc_tcaplus_tablegroup_test.go | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tencentcloud/data_source_tc_sqlserver_basic_instances_test.go b/tencentcloud/data_source_tc_sqlserver_basic_instances_test.go index e4b4136b53..18ee6f24bc 100644 --- a/tencentcloud/data_source_tc_sqlserver_basic_instances_test.go +++ b/tencentcloud/data_source_tc_sqlserver_basic_instances_test.go @@ -72,7 +72,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" { memory = 2 storage = 20 cpu = 1 - security_groups = ["sg-nltpbqg1"] + security_groups = ["` + defaultSecurityGroup + `"] tags = { "test" = "test" diff --git a/tencentcloud/data_source_tc_tcaplus_clusters_test.go b/tencentcloud/data_source_tc_tcaplus_clusters_test.go index 28fc277fe3..7ed10abbda 100644 --- a/tencentcloud/data_source_tc_tcaplus_clusters_test.go +++ b/tencentcloud/data_source_tc_tcaplus_clusters_test.go @@ -37,7 +37,7 @@ func TestAccTencentCloudDataTcaplusClusters(t *testing.T) { const testAccTencentCloudDataTcaplusClustersBaic = ` variable "availability_zone" { - default = "ap-shanghai-2" + default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { diff --git a/tencentcloud/data_source_tc_tcaplus_idls_test.go b/tencentcloud/data_source_tc_tcaplus_idls_test.go index 9dc6a71d90..a661e724aa 100644 --- a/tencentcloud/data_source_tc_tcaplus_idls_test.go +++ b/tencentcloud/data_source_tc_tcaplus_idls_test.go @@ -29,7 +29,7 @@ func TestAccTencentCloudDataTcaplusIdls(t *testing.T) { const testAccTencentCloudDataTcaplusIdlsBaic = ` variable "availability_zone" { -default = "ap-shanghai-2" +default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { diff --git a/tencentcloud/data_source_tc_tcaplus_tablegroups_test.go b/tencentcloud/data_source_tc_tcaplus_tablegroups_test.go index 3de6ed185a..66191eb060 100644 --- a/tencentcloud/data_source_tc_tcaplus_tablegroups_test.go +++ b/tencentcloud/data_source_tc_tcaplus_tablegroups_test.go @@ -35,7 +35,7 @@ func TestAccTencentCloudDataTcaplusGroups(t *testing.T) { const testAccTencentCloudDataTcaplusGroupsBaic = ` variable "availability_zone" { -default = "ap-shanghai-2" +default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { diff --git a/tencentcloud/data_source_tc_tcaplus_tables_test.go b/tencentcloud/data_source_tc_tcaplus_tables_test.go index 6a2669b27a..e793cedaed 100644 --- a/tencentcloud/data_source_tc_tcaplus_tables_test.go +++ b/tencentcloud/data_source_tc_tcaplus_tables_test.go @@ -44,7 +44,7 @@ func TestAccTencentCloudDataTcaplusTables(t *testing.T) { const testAccTencentCloudDataTcaplusTablesBaic = ` variable "availability_zone" { -default = "ap-shanghai-2" +default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { diff --git a/tencentcloud/resource_tc_cos_bucket_test.go b/tencentcloud/resource_tc_cos_bucket_test.go index 0714f39812..908b91e8a0 100644 --- a/tencentcloud/resource_tc_cos_bucket_test.go +++ b/tencentcloud/resource_tc_cos_bucket_test.go @@ -579,7 +579,7 @@ resource "tencentcloud_cos_bucket" "bucket_website" { func testAccBucket_MAZ(appid string) string { return fmt.Sprintf(` resource "tencentcloud_cos_bucket" "bucket_maz" { - bucket = "tf-bucket-website-%s" + bucket = "tf-bucket-maz-%s" acl = "public-read" multi_az = true } @@ -589,7 +589,7 @@ resource "tencentcloud_cos_bucket" "bucket_maz" { func testAccBucket_originPull(appid string) string { return fmt.Sprintf(` resource "tencentcloud_cos_bucket" "with_origin" { - bucket = "tf-bucket-website-%s" + bucket = "tf-bucket-origin-%s" acl = "private" origin_pull_rules { priority = 1 @@ -611,7 +611,7 @@ resource "tencentcloud_cos_bucket" "with_origin" { func testAccBucket_originPullUpdate(appid string) string { return fmt.Sprintf(` resource "tencentcloud_cos_bucket" "with_origin" { - bucket = "tf-bucket-website-%s" + bucket = "tf-bucket-origin-%s" acl = "private" origin_pull_rules { priority = 1 @@ -633,7 +633,7 @@ resource "tencentcloud_cos_bucket" "with_origin" { func testAccBucket_originDomain(appid string) string { return fmt.Sprintf(` resource "tencentcloud_cos_bucket" "with_domain" { - bucket = "tf-bucket-website-%s" + bucket = "tf-bucket-domain-%s" acl = "private" origin_domain_rules { status = "ENABLED" @@ -646,7 +646,7 @@ resource "tencentcloud_cos_bucket" "with_domain" { func testAccBucket_originDomainUpdate(appid string) string { return fmt.Sprintf(` resource "tencentcloud_cos_bucket" "with_domain" { - bucket = "tf-bucket-website-%s" + bucket = "tf-bucket-domain-%s" acl = "private" origin_domain_rules { status = "DISABLED" diff --git a/tencentcloud/resource_tc_sqlserver_basic_instance_test.go b/tencentcloud/resource_tc_sqlserver_basic_instance_test.go index 90df9cf33e..5bebce8c53 100644 --- a/tencentcloud/resource_tc_sqlserver_basic_instance_test.go +++ b/tencentcloud/resource_tc_sqlserver_basic_instance_test.go @@ -151,7 +151,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" { charge_type = "POSTPAID_BY_HOUR" vpc_id = tencentcloud_vpc.foo.id subnet_id = tencentcloud_subnet.foo.id - security_groups = ["sg-nltpbqg1"] + security_groups = ["` + defaultSecurityGroup + `"] project_id = 0 memory = 2 storage = 20 @@ -174,7 +174,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" { charge_type = "POSTPAID_BY_HOUR" vpc_id = tencentcloud_vpc.foo.id subnet_id = tencentcloud_subnet.foo.id - security_groups = ["sg-nltpbqg1"] + security_groups = ["` + defaultSecurityGroup + `"] project_id = 0 memory = 4 storage = 100 diff --git a/tencentcloud/resource_tc_sqlserver_instance_test.go b/tencentcloud/resource_tc_sqlserver_instance_test.go index f5d54a7e73..33b93aa577 100644 --- a/tencentcloud/resource_tc_sqlserver_instance_test.go +++ b/tencentcloud/resource_tc_sqlserver_instance_test.go @@ -163,15 +163,15 @@ func testAccCheckSqlserverInstanceExists(n string) resource.TestCheckFunc { } const testAccSqlserverInstanceBasic = ` -variable "availability_zone"{ - default = "ap-guangzhou-2" +data "tencentcloud_availability_zones_by_product" "zone" { + product = "sqlserver" } ` const testAccSqlserverInstance string = testAccSqlserverInstanceBasic + ` resource "tencentcloud_sqlserver_instance" "test" { name = "tf_sqlserver_instance" - availability_zone = var.availability_zone + availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name charge_type = "POSTPAID_BY_HOUR" vpc_id = "` + defaultVpcId + `" subnet_id = "` + defaultSubnetId + `" @@ -192,7 +192,7 @@ resource "tencentcloud_sqlserver_instance" "test" { const testAccSqlserverInstanceUpdate string = testAccSqlserverInstanceBasic + ` resource "tencentcloud_sqlserver_instance" "test" { name = "tf_sqlserver_instance_update" - availability_zone = var.availability_zone + availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name charge_type = "POSTPAID_BY_HOUR" vpc_id = "` + defaultVpcId + `" subnet_id = "` + defaultSubnetId + `" @@ -212,7 +212,7 @@ resource "tencentcloud_sqlserver_instance" "test" { const testAccSqlserverInstanceMultiCluster string = testAccSqlserverInstanceBasic + ` resource "tencentcloud_sqlserver_instance" "test" { name = "tf_sqlserver_instance_multi" - availability_zone = var.availability_zone + availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name charge_type = "POSTPAID_BY_HOUR" engine_version = "2017" vpc_id = "` + defaultVpcId + `" diff --git a/tencentcloud/resource_tc_tcaplus_cluster_test.go b/tencentcloud/resource_tc_tcaplus_cluster_test.go index 7783737c99..9e77fc1cf4 100644 --- a/tencentcloud/resource_tc_tcaplus_cluster_test.go +++ b/tencentcloud/resource_tc_tcaplus_cluster_test.go @@ -117,7 +117,7 @@ func testAccCheckTcaplusClusterExists(n string) resource.TestCheckFunc { const testAccTcaplusClusterBaic = ` variable "availability_zone" { -default = "ap-shanghai-2" +default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { diff --git a/tencentcloud/resource_tc_tcaplus_idl_test.go b/tencentcloud/resource_tc_tcaplus_idl_test.go index b78ec2ac16..90cb5ade10 100644 --- a/tencentcloud/resource_tc_tcaplus_idl_test.go +++ b/tencentcloud/resource_tc_tcaplus_idl_test.go @@ -102,7 +102,7 @@ func testAccCheckTcaplusIdlExists(n string) resource.TestCheckFunc { } const testAccTcaplusIdlBasic = `variable "availability_zone" { - default = "ap-shanghai-2" + default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { diff --git a/tencentcloud/resource_tc_tcaplus_table_test.go b/tencentcloud/resource_tc_tcaplus_table_test.go index 44cd68347f..e21a59ed94 100644 --- a/tencentcloud/resource_tc_tcaplus_table_test.go +++ b/tencentcloud/resource_tc_tcaplus_table_test.go @@ -112,7 +112,7 @@ func testAccCheckTcaplusTableExists(n string) resource.TestCheckFunc { } const testAccTcaplusTableBasic = `variable "availability_zone" { - default = "ap-shanghai-2" + default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { is_default = true diff --git a/tencentcloud/resource_tc_tcaplus_tablegroup_test.go b/tencentcloud/resource_tc_tcaplus_tablegroup_test.go index f0054fb527..c2be79d170 100644 --- a/tencentcloud/resource_tc_tcaplus_tablegroup_test.go +++ b/tencentcloud/resource_tc_tcaplus_tablegroup_test.go @@ -95,7 +95,7 @@ func testAccCheckTcaplusGroupExists(n string) resource.TestCheckFunc { } const testAccTcaplusGroupBasic = `variable "availability_zone" { - default = "ap-shanghai-2" + default = "ap-guangzhou-3" } data "tencentcloud_vpc_subnets" "vpc" { is_default = true From df3ec23cbdc21cb1cf775585717bca08ac7f3e13 Mon Sep 17 00:00:00 2001 From: KGSN Date: Wed, 29 Dec 2021 20:19:03 +0800 Subject: [PATCH 2/2] fix: test_case - sqlserver --- .../resource_tc_sqlserver_account_db_attachment_test.go | 4 ++-- tencentcloud/resource_tc_sqlserver_instance_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go b/tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go index 22ffb694ff..050b9d420c 100644 --- a/tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go +++ b/tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go @@ -125,14 +125,14 @@ resource "tencentcloud_sqlserver_account" "test" { } resource "tencentcloud_sqlserver_db" "test" { - instance_id = "mssql-3cdq7kx5" + instance_id = tencentcloud_sqlserver_instance.test.id name = "test111" charset = "Chinese_PRC_BIN" remark = "testACC-remark" } resource "tencentcloud_sqlserver_account_db_attachment" "test" { - instance_id = "mssql-3cdq7kx5" + instance_id = tencentcloud_sqlserver_instance.test.id account_name = tencentcloud_sqlserver_account.test.name db_name = tencentcloud_sqlserver_db.test.name privilege = "ReadOnly" diff --git a/tencentcloud/resource_tc_sqlserver_instance_test.go b/tencentcloud/resource_tc_sqlserver_instance_test.go index 33b93aa577..9b1ea68416 100644 --- a/tencentcloud/resource_tc_sqlserver_instance_test.go +++ b/tencentcloud/resource_tc_sqlserver_instance_test.go @@ -171,7 +171,7 @@ data "tencentcloud_availability_zones_by_product" "zone" { const testAccSqlserverInstance string = testAccSqlserverInstanceBasic + ` resource "tencentcloud_sqlserver_instance" "test" { name = "tf_sqlserver_instance" - availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name + availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[1].name charge_type = "POSTPAID_BY_HOUR" vpc_id = "` + defaultVpcId + `" subnet_id = "` + defaultSubnetId + `" @@ -181,7 +181,7 @@ resource "tencentcloud_sqlserver_instance" "test" { maintenance_week_set = [1,2,3] maintenance_start_time = "09:00" maintenance_time_span = 3 - security_groups = ["sg-nltpbqg1"] + security_groups = ["` + defaultSecurityGroup + `"] tags = { "test" = "test"