Skip to content

Commit ca5335a

Browse files
authored
fix: partial cases 1229 (#804)
* fix: partial cases - sqlserver,cos,tcaplus * fix: test_case - sqlserver
1 parent 1ae7042 commit ca5335a

13 files changed

+24
-24
lines changed

tencentcloud/data_source_tc_sqlserver_basic_instances_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
7272
memory = 2
7373
storage = 20
7474
cpu = 1
75-
security_groups = ["sg-nltpbqg1"]
75+
security_groups = ["` + defaultSecurityGroup + `"]
7676
7777
tags = {
7878
"test" = "test"

tencentcloud/data_source_tc_tcaplus_clusters_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestAccTencentCloudDataTcaplusClusters(t *testing.T) {
3737

3838
const testAccTencentCloudDataTcaplusClustersBaic = `
3939
variable "availability_zone" {
40-
default = "ap-shanghai-2"
40+
default = "ap-guangzhou-3"
4141
}
4242
4343
data "tencentcloud_vpc_subnets" "vpc" {

tencentcloud/data_source_tc_tcaplus_idls_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestAccTencentCloudDataTcaplusIdls(t *testing.T) {
2929

3030
const testAccTencentCloudDataTcaplusIdlsBaic = `
3131
variable "availability_zone" {
32-
default = "ap-shanghai-2"
32+
default = "ap-guangzhou-3"
3333
}
3434
3535
data "tencentcloud_vpc_subnets" "vpc" {

tencentcloud/data_source_tc_tcaplus_tablegroups_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestAccTencentCloudDataTcaplusGroups(t *testing.T) {
3535

3636
const testAccTencentCloudDataTcaplusGroupsBaic = `
3737
variable "availability_zone" {
38-
default = "ap-shanghai-2"
38+
default = "ap-guangzhou-3"
3939
}
4040
4141
data "tencentcloud_vpc_subnets" "vpc" {

tencentcloud/data_source_tc_tcaplus_tables_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestAccTencentCloudDataTcaplusTables(t *testing.T) {
4444

4545
const testAccTencentCloudDataTcaplusTablesBaic = `
4646
variable "availability_zone" {
47-
default = "ap-shanghai-2"
47+
default = "ap-guangzhou-3"
4848
}
4949
5050
data "tencentcloud_vpc_subnets" "vpc" {

tencentcloud/resource_tc_cos_bucket_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ resource "tencentcloud_cos_bucket" "bucket_website" {
579579
func testAccBucket_MAZ(appid string) string {
580580
return fmt.Sprintf(`
581581
resource "tencentcloud_cos_bucket" "bucket_maz" {
582-
bucket = "tf-bucket-website-%s"
582+
bucket = "tf-bucket-maz-%s"
583583
acl = "public-read"
584584
multi_az = true
585585
}
@@ -589,7 +589,7 @@ resource "tencentcloud_cos_bucket" "bucket_maz" {
589589
func testAccBucket_originPull(appid string) string {
590590
return fmt.Sprintf(`
591591
resource "tencentcloud_cos_bucket" "with_origin" {
592-
bucket = "tf-bucket-website-%s"
592+
bucket = "tf-bucket-origin-%s"
593593
acl = "private"
594594
origin_pull_rules {
595595
priority = 1
@@ -611,7 +611,7 @@ resource "tencentcloud_cos_bucket" "with_origin" {
611611
func testAccBucket_originPullUpdate(appid string) string {
612612
return fmt.Sprintf(`
613613
resource "tencentcloud_cos_bucket" "with_origin" {
614-
bucket = "tf-bucket-website-%s"
614+
bucket = "tf-bucket-origin-%s"
615615
acl = "private"
616616
origin_pull_rules {
617617
priority = 1
@@ -633,7 +633,7 @@ resource "tencentcloud_cos_bucket" "with_origin" {
633633
func testAccBucket_originDomain(appid string) string {
634634
return fmt.Sprintf(`
635635
resource "tencentcloud_cos_bucket" "with_domain" {
636-
bucket = "tf-bucket-website-%s"
636+
bucket = "tf-bucket-domain-%s"
637637
acl = "private"
638638
origin_domain_rules {
639639
status = "ENABLED"
@@ -646,7 +646,7 @@ resource "tencentcloud_cos_bucket" "with_domain" {
646646
func testAccBucket_originDomainUpdate(appid string) string {
647647
return fmt.Sprintf(`
648648
resource "tencentcloud_cos_bucket" "with_domain" {
649-
bucket = "tf-bucket-website-%s"
649+
bucket = "tf-bucket-domain-%s"
650650
acl = "private"
651651
origin_domain_rules {
652652
status = "DISABLED"

tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ resource "tencentcloud_sqlserver_account" "test" {
125125
}
126126
127127
resource "tencentcloud_sqlserver_db" "test" {
128-
instance_id = "mssql-3cdq7kx5"
128+
instance_id = tencentcloud_sqlserver_instance.test.id
129129
name = "test111"
130130
charset = "Chinese_PRC_BIN"
131131
remark = "testACC-remark"
132132
}
133133
134134
resource "tencentcloud_sqlserver_account_db_attachment" "test" {
135-
instance_id = "mssql-3cdq7kx5"
135+
instance_id = tencentcloud_sqlserver_instance.test.id
136136
account_name = tencentcloud_sqlserver_account.test.name
137137
db_name = tencentcloud_sqlserver_db.test.name
138138
privilege = "ReadOnly"

tencentcloud/resource_tc_sqlserver_basic_instance_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
151151
charge_type = "POSTPAID_BY_HOUR"
152152
vpc_id = tencentcloud_vpc.foo.id
153153
subnet_id = tencentcloud_subnet.foo.id
154-
security_groups = ["sg-nltpbqg1"]
154+
security_groups = ["` + defaultSecurityGroup + `"]
155155
project_id = 0
156156
memory = 2
157157
storage = 20
@@ -174,7 +174,7 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
174174
charge_type = "POSTPAID_BY_HOUR"
175175
vpc_id = tencentcloud_vpc.foo.id
176176
subnet_id = tencentcloud_subnet.foo.id
177-
security_groups = ["sg-nltpbqg1"]
177+
security_groups = ["` + defaultSecurityGroup + `"]
178178
project_id = 0
179179
memory = 4
180180
storage = 100

tencentcloud/resource_tc_sqlserver_instance_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@ func testAccCheckSqlserverInstanceExists(n string) resource.TestCheckFunc {
163163
}
164164

165165
const testAccSqlserverInstanceBasic = `
166-
variable "availability_zone"{
167-
default = "ap-guangzhou-2"
166+
data "tencentcloud_availability_zones_by_product" "zone" {
167+
product = "sqlserver"
168168
}
169169
`
170170

171171
const testAccSqlserverInstance string = testAccSqlserverInstanceBasic + `
172172
resource "tencentcloud_sqlserver_instance" "test" {
173173
name = "tf_sqlserver_instance"
174-
availability_zone = var.availability_zone
174+
availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[1].name
175175
charge_type = "POSTPAID_BY_HOUR"
176176
vpc_id = "` + defaultVpcId + `"
177177
subnet_id = "` + defaultSubnetId + `"
@@ -181,7 +181,7 @@ resource "tencentcloud_sqlserver_instance" "test" {
181181
maintenance_week_set = [1,2,3]
182182
maintenance_start_time = "09:00"
183183
maintenance_time_span = 3
184-
security_groups = ["sg-nltpbqg1"]
184+
security_groups = ["` + defaultSecurityGroup + `"]
185185
186186
tags = {
187187
"test" = "test"
@@ -192,7 +192,7 @@ resource "tencentcloud_sqlserver_instance" "test" {
192192
const testAccSqlserverInstanceUpdate string = testAccSqlserverInstanceBasic + `
193193
resource "tencentcloud_sqlserver_instance" "test" {
194194
name = "tf_sqlserver_instance_update"
195-
availability_zone = var.availability_zone
195+
availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name
196196
charge_type = "POSTPAID_BY_HOUR"
197197
vpc_id = "` + defaultVpcId + `"
198198
subnet_id = "` + defaultSubnetId + `"
@@ -212,7 +212,7 @@ resource "tencentcloud_sqlserver_instance" "test" {
212212
const testAccSqlserverInstanceMultiCluster string = testAccSqlserverInstanceBasic + `
213213
resource "tencentcloud_sqlserver_instance" "test" {
214214
name = "tf_sqlserver_instance_multi"
215-
availability_zone = var.availability_zone
215+
availability_zone = data.tencentcloud_availability_zones_by_product.zone.zones[0].name
216216
charge_type = "POSTPAID_BY_HOUR"
217217
engine_version = "2017"
218218
vpc_id = "` + defaultVpcId + `"

tencentcloud/resource_tc_tcaplus_cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func testAccCheckTcaplusClusterExists(n string) resource.TestCheckFunc {
117117

118118
const testAccTcaplusClusterBaic = `
119119
variable "availability_zone" {
120-
default = "ap-shanghai-2"
120+
default = "ap-guangzhou-3"
121121
}
122122
123123
data "tencentcloud_vpc_subnets" "vpc" {

0 commit comments

Comments
 (0)