Skip to content

Commit 75384f4

Browse files
author
hhermanwang
committed
merge upstream Conflict resolution
1 parent a561a55 commit 75384f4

File tree

4 files changed

+104
-104
lines changed

4 files changed

+104
-104
lines changed

‎tencentcloud/data_source_tc_sqlserver_instances_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ func TestAccTencentCloudDataSqlserverInstances(t *testing.T) {
4040

4141
const testAccTencentCloudDataSqlserverInstancesBasic = `
4242
variable "availability_zone"{
43-
default = "ap-guangzhou-2"
43+
default = "ap-guangzhou-2"
4444
}
4545
4646
resource "tencentcloud_sqlserver_instance" "test" {
47-
name = "tf_postsql_instance"
47+
name = "tf_postsql_instance"
4848
availability_zone = var.availability_zone
49-
charge_type = "POSTPAID_BY_HOUR"
50-
project_id = 0
51-
memory = 2
52-
storage = 10
49+
charge_type = "POSTPAID_BY_HOUR"
50+
project_id = 0
51+
memory = 2
52+
storage = 10
5353
tags = {
5454
tf = "test"
5555
}

‎tencentcloud/resource_tc_elasticsearch_instance_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,17 @@ func testAccCheckElasticsearchInstanceExists(n string) resource.TestCheckFunc {
125125

126126
const testAccElasticsearchInstance = defaultVpcVariable + `
127127
resource "tencentcloud_elasticsearch_instance" "foo" {
128-
instance_name = "tf-ci-test"
129-
availability_zone = var.availability_zone
130-
version = "7.5.1"
131-
vpc_id = var.vpc_id
132-
subnet_id = var.subnet_id
133-
password = "Test1234"
134-
license_type = "oss"
128+
instance_name = "tf-ci-test"
129+
availability_zone = var.availability_zone
130+
version = "7.5.1"
131+
vpc_id = var.vpc_id
132+
subnet_id = var.subnet_id
133+
password = "Test1234"
134+
license_type = "oss"
135135
136136
node_info_list {
137-
node_num = 2
138-
node_type = "ES.S1.SMALL2"
137+
node_num = 2
138+
node_type = "ES.S1.SMALL2"
139139
}
140140
141141
tags = {
@@ -156,9 +156,9 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
156156
basic_security_type = 2
157157
158158
node_info_list {
159-
node_num = 2
160-
node_type = "ES.S1.MEDIUM8"
161-
disk_size = 200
159+
node_num = 2
160+
node_type = "ES.S1.MEDIUM8"
161+
disk_size = 200
162162
}
163163
164164
tags = {

‎tencentcloud/resource_tc_sqlserver_instance_test.go‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -168,63 +168,63 @@ variable "availability_zone"{
168168

169169
const testAccSqlserverInstance string = testAccSqlserverInstanceBasic + `
170170
resource "tencentcloud_sqlserver_instance" "test" {
171-
name = "tf_sqlserver_instance"
172-
availability_zone = var.availability_zone
173-
charge_type = "POSTPAID_BY_HOUR"
174-
vpc_id = "` + defaultVpcId + `"
175-
subnet_id = "` + defaultSubnetId + `"
176-
project_id = 0
177-
memory = 2
178-
storage = 10
179-
maintenance_week_set = [1,2,3]
180-
maintenance_start_time = "09:00"
181-
maintenance_time_span = 3
182-
security_groups = ["sg-nltpbqg1"]
171+
name = "tf_sqlserver_instance"
172+
availability_zone = var.availability_zone
173+
charge_type = "POSTPAID_BY_HOUR"
174+
vpc_id = "` + defaultVpcId + `"
175+
subnet_id = "` + defaultSubnetId + `"
176+
project_id = 0
177+
memory = 2
178+
storage = 10
179+
maintenance_week_set = [1,2,3]
180+
maintenance_start_time = "09:00"
181+
maintenance_time_span = 3
182+
security_groups = ["sg-nltpbqg1"]
183183
184184
tags = {
185-
"test" = "test"
185+
"test" = "test"
186186
}
187187
}
188188
`
189189

190190
const testAccSqlserverInstanceUpdate string = testAccSqlserverInstanceBasic + `
191191
resource "tencentcloud_sqlserver_instance" "test" {
192-
name = "tf_sqlserver_instance_update"
193-
availability_zone = var.availability_zone
194-
charge_type = "POSTPAID_BY_HOUR"
195-
vpc_id = "` + defaultVpcId + `"
196-
subnet_id = "` + defaultSubnetId + `"
197-
project_id = 1154137
198-
memory = 4
199-
storage = 20
200-
maintenance_week_set = [2,3,4]
201-
maintenance_start_time = "08:00"
202-
maintenance_time_span = 4
192+
name = "tf_sqlserver_instance_update"
193+
availability_zone = var.availability_zone
194+
charge_type = "POSTPAID_BY_HOUR"
195+
vpc_id = "` + defaultVpcId + `"
196+
subnet_id = "` + defaultSubnetId + `"
197+
project_id = 1154137
198+
memory = 4
199+
storage = 20
200+
maintenance_week_set = [2,3,4]
201+
maintenance_start_time = "08:00"
202+
maintenance_time_span = 4
203203
204204
tags = {
205-
abc = "abc"
205+
abc = "abc"
206206
}
207207
}
208208
`
209209

210210
const testAccSqlserverInstanceMultiCluster string = testAccSqlserverInstanceBasic + `
211211
resource "tencentcloud_sqlserver_instance" "test" {
212-
name = "tf_sqlserver_instance_multi"
213-
availability_zone = var.availability_zone
214-
charge_type = "POSTPAID_BY_HOUR"
215-
engine_version = "2017"
216-
vpc_id = "` + defaultVpcId + `"
217-
subnet_id = "` + defaultSubnetId + `"
218-
project_id = 0
219-
memory = 2
220-
storage = 10
221-
multi_zones = true
222-
ha_type = "CLUSTER"
223-
maintenance_week_set = [1,2,3]
224-
maintenance_start_time = "09:00"
225-
maintenance_time_span = 3
212+
name = "tf_sqlserver_instance_multi"
213+
availability_zone = var.availability_zone
214+
charge_type = "POSTPAID_BY_HOUR"
215+
engine_version = "2017"
216+
vpc_id = "` + defaultVpcId + `"
217+
subnet_id = "` + defaultSubnetId + `"
218+
project_id = 0
219+
memory = 2
220+
storage = 10
221+
multi_zones = true
222+
ha_type = "CLUSTER"
223+
maintenance_week_set = [1,2,3]
224+
maintenance_start_time = "09:00"
225+
maintenance_time_span = 3
226226
tags = {
227-
"test" = "test"
227+
"test" = "test"
228228
}
229229
}
230230
`

‎tencentcloud/resource_tc_sqlserver_readonly_instance_test.go‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -120,35 +120,35 @@ func testAccCheckReadonlySqlserverInstanceExists(n string) resource.TestCheckFun
120120

121121
const testAccReadonlySqlserverInstance string = testAccSqlserverInstanceBasic + `
122122
resource "tencentcloud_sqlserver_instance" "test" {
123-
name = "tf_sqlserver_instance_multi"
124-
availability_zone = "ap-guangzhou-2"
125-
charge_type = "POSTPAID_BY_HOUR"
126-
engine_version = "2017"
127-
vpc_id = "` + defaultVpcId + `"
128-
subnet_id = "` + defaultSubnetId + `"
129-
project_id = 0
130-
memory = 2
131-
storage = 10
132-
ha_type = "CLUSTER"
133-
maintenance_week_set = [1,2,3]
134-
maintenance_start_time = "09:00"
135-
maintenance_time_span = 3
123+
name = "tf_sqlserver_instance_multi"
124+
availability_zone = "ap-guangzhou-2"
125+
charge_type = "POSTPAID_BY_HOUR"
126+
engine_version = "2017"
127+
vpc_id = "` + defaultVpcId + `"
128+
subnet_id = "` + defaultSubnetId + `"
129+
project_id = 0
130+
memory = 2
131+
storage = 10
132+
ha_type = "CLUSTER"
133+
maintenance_week_set = [1,2,3]
134+
maintenance_start_time = "09:00"
135+
maintenance_time_span = 3
136136
tags = {
137137
"test" = "test"
138138
}
139139
}
140140
141141
resource "tencentcloud_sqlserver_readonly_instance" "test" {
142-
name = "tf_sqlserver_instance_ro"
143-
availability_zone = "ap-guangzhou-2"
144-
charge_type = "POSTPAID_BY_HOUR"
145-
vpc_id = "` + defaultVpcId + `"
146-
subnet_id = "` + defaultSubnetId + `"
147-
memory = 2
148-
storage = 10
149-
master_instance_id = tencentcloud_sqlserver_instance.test.id
150-
readonly_group_type = 1
151-
force_upgrade = true
142+
name = "tf_sqlserver_instance_ro"
143+
availability_zone = "ap-guangzhou-2"
144+
charge_type = "POSTPAID_BY_HOUR"
145+
vpc_id = "` + defaultVpcId + `"
146+
subnet_id = "` + defaultSubnetId + `"
147+
memory = 2
148+
storage = 10
149+
master_instance_id = tencentcloud_sqlserver_instance.test.id
150+
readonly_group_type = 1
151+
force_upgrade = true
152152
tags = {
153153
"test" = "test"
154154
}
@@ -157,35 +157,35 @@ resource "tencentcloud_sqlserver_readonly_instance" "test" {
157157

158158
const testAccReadonlySqlserverInstanceUpdate string = testAccSqlserverInstanceBasic + `
159159
resource = tencentcloud_sqlserver_instance" "test" {
160-
name = "tf_sqlserver_instance_multi"
161-
availability_zone = "ap-guangzhou-2"
162-
charge_type = "POSTPAID_BY_HOUR"
163-
engine_version = "2017"
164-
vpc_id = "` + defaultVpcId + `"
165-
subnet_id = "` + defaultSubnetId + `"
166-
project_id = 0
167-
memory = 2
168-
storage = 10
169-
ha_type = "CLUSTER"
170-
maintenance_week_set = [1,2,3]
171-
maintenance_start_time = "09:00"
172-
maintenance_time_span = 3
160+
name = "tf_sqlserver_instance_multi"
161+
availability_zone = "ap-guangzhou-2"
162+
charge_type = "POSTPAID_BY_HOUR"
163+
engine_version = "2017"
164+
vpc_id = "` + defaultVpcId + `"
165+
subnet_id = "` + defaultSubnetId + `"
166+
project_id = 0
167+
memory = 2
168+
storage = 10
169+
ha_type = "CLUSTER"
170+
maintenance_week_set = [1,2,3]
171+
maintenance_start_time = "09:00"
172+
maintenance_time_span = 3
173173
tags = {
174174
abc = "abc"
175175
}
176176
}
177177
178178
resource "tencentcloud_sqlserver_readonly_instance" "test" {
179-
name = "tf_sqlserver_instance_update_ro"
180-
availability_zone = "ap-guangzhou-2"
181-
charge_type = "POSTPAID_BY_HOUR"
182-
vpc_id = "` + defaultVpcId + `"
183-
subnet_id = "` + defaultSubnetId + `"
184-
memory = 4
185-
storage = 20
186-
master_instance_id = tencentcloud_sqlserver_instance.test.id
187-
readonly_group_type = 1
188-
force_upgrade = true
179+
name = "tf_sqlserver_instance_update_ro"
180+
availability_zone = "ap-guangzhou-2"
181+
charge_type = "POSTPAID_BY_HOUR"
182+
vpc_id = "` + defaultVpcId + `"
183+
subnet_id = "` + defaultSubnetId + `"
184+
memory = 4
185+
storage = 20
186+
master_instance_id = tencentcloud_sqlserver_instance.test.id
187+
readonly_group_type = 1
188+
force_upgrade = true
189189
tags = {
190190
abc = "abc"
191191
}

0 commit comments

Comments
 (0)