Skip to content

Commit 76ccb3c

Browse files
authored
fix: sqlserver - pubsub testcase (#1032)
* fix: sqlserver - pubsub testcase * fix: sqlserver pubsub testcase - delete sub DB when destroy
1 parent ca3c9f8 commit 76ccb3c

File tree

2 files changed

+28
-85
lines changed

2 files changed

+28
-85
lines changed

tencentcloud/basic_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,10 @@ locals {
269269

270270
// SQLServer
271271
const defaultSQLServerName = "keep-preset_sqlserver"
272+
const defaultPubSQLServerName = "keep-publish-instance"
273+
const defaultSubSQLServerName = "keep-subscribe-instance"
272274
const defaultSQLServerDB = "keep_sqlserver_db"
275+
const defaultSQLServerPubSubDB = "keep_pubsub_db"
273276
const defaultSQLServerAccount = "keep_sqlserver_account"
274277

275278
const CommonPresetSQLServer = `
@@ -308,6 +311,21 @@ locals {
308311
}
309312
`
310313

314+
const CommonPubSubSQLServer = `
315+
data "tencentcloud_sqlserver_instances" "pub_sqlserver" {
316+
name = "` + defaultPubSQLServerName + `"
317+
}
318+
data "tencentcloud_sqlserver_instances" "sub_sqlserver" {
319+
name = "` + defaultSubSQLServerName + `"
320+
}
321+
322+
locals {
323+
pub_sqlserver_id = data.tencentcloud_sqlserver_instances.pub_sqlserver.instance_list.0.id
324+
sub_sqlserver_id = data.tencentcloud_sqlserver_instances.sub_sqlserver.instance_list.0.id
325+
sqlserver_pubsub_db = "` + defaultSQLServerPubSubDB + `"
326+
}
327+
`
328+
311329
const instanceCommonTestCase = defaultInstanceVariable + `
312330
resource "tencentcloud_instance" "default" {
313331
instance_name = var.instance_name

tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go

Lines changed: 10 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
)
1212

1313
func TestAccTencentCloudSqlserverPublishSubscribeResource(t *testing.T) {
14-
t.Parallel()
1514
resource.Test(t, resource.TestCase{
1615
PreCheck: func() { testAccPreCheck(t) },
1716
Providers: testAccProviders,
@@ -26,7 +25,6 @@ func TestAccTencentCloudSqlserverPublishSubscribeResource(t *testing.T) {
2625
resource.TestCheckResourceAttr("tencentcloud_sqlserver_publish_subscribe.example", "publish_subscribe_name", "example"),
2726
resource.TestCheckResourceAttr("tencentcloud_sqlserver_publish_subscribe.example", "database_tuples.#", "1"),
2827
),
29-
Destroy: false,
3028
},
3129
{
3230
Config: testAccSqlserverPublishSubscribe_basic_update_name,
@@ -97,98 +95,25 @@ func testAccCheckSqlserverPublishSubscribeExists(n string) resource.TestCheckFun
9795
}
9896
}
9997

100-
const testAccSqlserverPublishSubscribe_basic = defaultVpcSubnets + defaultSecurityGroupData + `
101-
resource "tencentcloud_sqlserver_instance" "publish_instance" {
102-
name = "tf_sqlserver_publish_instance"
103-
availability_zone = var.default_az
104-
charge_type = "POSTPAID_BY_HOUR"
105-
vpc_id = local.vpc_id
106-
subnet_id = local.subnet_id
107-
project_id = 0
108-
memory = 2
109-
storage = 10
110-
maintenance_week_set = [1,2,3]
111-
maintenance_start_time = "09:00"
112-
maintenance_time_span = 3
113-
security_groups = [local.sg_id]
114-
}
115-
116-
resource "tencentcloud_sqlserver_instance" "subscribe_instance" {
117-
name = "tf_sqlserver_subscribe_instance"
118-
availability_zone = var.default_az
119-
charge_type = "POSTPAID_BY_HOUR"
120-
vpc_id = local.vpc_id
121-
subnet_id = local.subnet_id
122-
project_id = 0
123-
memory = 2
124-
storage = 10
125-
maintenance_week_set = [1,2,3]
126-
maintenance_start_time = "09:00"
127-
maintenance_time_span = 3
128-
security_groups = [local.sg_id]
129-
}
130-
131-
resource "tencentcloud_sqlserver_db" "test_publish_subscribe" {
132-
instance_id = tencentcloud_sqlserver_instance.publish_instance.id
133-
name = "test111"
134-
charset = "Chinese_PRC_BIN"
135-
remark = "testACC-remark"
136-
}
98+
const testAccSqlserverPublishSubscribe_basic = CommonPubSubSQLServer + `
13799
138100
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
139-
publish_instance_id = tencentcloud_sqlserver_instance.publish_instance.id
140-
subscribe_instance_id = tencentcloud_sqlserver_instance.subscribe_instance.id
101+
publish_instance_id = local.pub_sqlserver_id
102+
subscribe_instance_id = local.sub_sqlserver_id
141103
publish_subscribe_name = "example"
142-
delete_subscribe_db = false
104+
delete_subscribe_db = true
143105
database_tuples {
144-
publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name
106+
publish_database = local.sqlserver_pubsub_db
145107
}
146108
}`
147109

148-
const testAccSqlserverPublishSubscribe_basic_update_name = defaultVpcSubnets + defaultSecurityGroupData + `
149-
resource "tencentcloud_sqlserver_instance" "publish_instance" {
150-
name = "tf_sqlserver_publish_instance"
151-
availability_zone = var.default_az
152-
charge_type = "POSTPAID_BY_HOUR"
153-
vpc_id = local.vpc_id
154-
subnet_id = local.subnet_id
155-
project_id = 0
156-
memory = 2
157-
storage = 10
158-
maintenance_week_set = [1,2,3]
159-
maintenance_start_time = "09:00"
160-
maintenance_time_span = 3
161-
security_groups = [local.sg_id]
162-
}
163-
164-
resource "tencentcloud_sqlserver_instance" "subscribe_instance" {
165-
name = "tf_sqlserver_subscribe_instance"
166-
availability_zone = var.default_az
167-
charge_type = "POSTPAID_BY_HOUR"
168-
vpc_id = local.vpc_id
169-
subnet_id = local.subnet_id
170-
project_id = 0
171-
memory = 2
172-
storage = 10
173-
maintenance_week_set = [1,2,3]
174-
maintenance_start_time = "09:00"
175-
maintenance_time_span = 3
176-
security_groups = [local.sg_id]
177-
}
178-
179-
resource "tencentcloud_sqlserver_db" "test_publish_subscribe" {
180-
instance_id = tencentcloud_sqlserver_instance.publish_instance.id
181-
name = "test111"
182-
charset = "Chinese_PRC_BIN"
183-
remark = "testACC-remark"
184-
}
185-
110+
const testAccSqlserverPublishSubscribe_basic_update_name = CommonPubSubSQLServer + `
186111
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
187-
publish_instance_id = tencentcloud_sqlserver_instance.publish_instance.id
188-
subscribe_instance_id = tencentcloud_sqlserver_instance.subscribe_instance.id
112+
publish_instance_id = local.pub_sqlserver_id
113+
subscribe_instance_id = local.sub_sqlserver_id
189114
publish_subscribe_name = "example1"
190-
delete_subscribe_db = false
115+
delete_subscribe_db = true
191116
database_tuples {
192-
publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name
117+
publish_database = local.sqlserver_pubsub_db
193118
}
194119
}`

0 commit comments

Comments
 (0)