Skip to content

Commit 26d2926

Browse files
authored
fix: sqlserver testcases (#986)
1 parent 8915c81 commit 26d2926

4 files changed

+10
-27
lines changed

tencentcloud/data_source_tc_sqlserver_account_db_attachments_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,18 @@ func TestAccDataSourceTencentCloudSqlserverAccountDBAttachments(t *testing.T) {
2828
})
2929
}
3030

31-
const testAccTencentCloudDataSqlserverAccountDBAttachmentsBasic = testAccSqlserverInstance + `
32-
resource "tencentcloud_sqlserver_account" "test" {
33-
instance_id = tencentcloud_sqlserver_instance.test.id
34-
name = "tf_sqlserver_account"
35-
password = "testt123"
36-
}
31+
const testAccTencentCloudDataSqlserverAccountDBAttachmentsBasic = CommonPresetSQLServerAccount + `
32+
3733
resource "tencentcloud_sqlserver_db" "test" {
3834
instance_id = tencentcloud_sqlserver_instance.test.id
39-
name = "test111"
35+
name = "test_db_attachment"
4036
charset = "Chinese_PRC_BIN"
4137
remark = "testACC-remark"
4238
}
4339
4440
resource "tencentcloud_sqlserver_account_db_attachment" "test" {
4541
instance_id = tencentcloud_sqlserver_instance.test.id
46-
account_name = tencentcloud_sqlserver_account.test.name
42+
account_name = local.sqlserver_account
4743
db_name = tencentcloud_sqlserver_db.test.name
4844
privilege = "ReadWrite"
4945
}

tencentcloud/data_source_tc_sqlserver_accounts_test.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccDataSourceTencentCloudSqlserverAccounts(t *testing.T) {
1818
{
1919
Config: testAccTencentCloudDataSqlserverAccountsBasic,
2020
Check: resource.ComposeTestCheckFunc(
21-
resource.TestCheckResourceAttr(testDataSqlserverAccountsName, "list.#", "1"),
21+
resource.TestCheckResourceAttrSet(testDataSqlserverAccountsName, "list.#"),
2222
resource.TestCheckResourceAttrSet(testDataSqlserverAccountsName, "list.0.status"),
2323
resource.TestCheckResourceAttrSet(testDataSqlserverAccountsName, "list.0.create_time"),
2424
resource.TestCheckResourceAttrSet(testDataSqlserverAccountsName, "list.0.update_time"),
@@ -29,14 +29,4 @@ func TestAccDataSourceTencentCloudSqlserverAccounts(t *testing.T) {
2929
})
3030
}
3131

32-
const testAccTencentCloudDataSqlserverAccountsBasic = testAccSqlserverInstance + `
33-
resource "tencentcloud_sqlserver_account" "test" {
34-
instance_id = tencentcloud_sqlserver_instance.test.id
35-
name = "tf_sqlserver_account1"
36-
password = "testt123"
37-
}
38-
data "tencentcloud_sqlserver_accounts" "test"{
39-
instance_id = tencentcloud_sqlserver_instance.test.id
40-
name = tencentcloud_sqlserver_account.test.name
41-
}
42-
`
32+
const testAccTencentCloudDataSqlserverAccountsBasic = CommonPresetSQLServerAccount

tencentcloud/resource_tc_sqlserver_instance_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ func TestAccTencentCloudSqlserverInstanceResource_PostPaid(t *testing.T) {
180180
ImportStateVerify: true,
181181
ImportStateVerifyIgnore: []string{"multi_zones", "auto_voucher"},
182182
},
183-
184183
{
185184
Config: testAccSqlserverInstanceUpdate,
186185
Check: resource.ComposeTestCheckFunc(
@@ -198,7 +197,7 @@ func TestAccTencentCloudSqlserverInstanceResource_PostPaid(t *testing.T) {
198197
resource.TestCheckResourceAttrSet(testSqlserverInstanceResourceKey, "vip"),
199198
resource.TestCheckResourceAttrSet(testSqlserverInstanceResourceKey, "vport"),
200199
resource.TestCheckResourceAttrSet(testSqlserverInstanceResourceKey, "status"),
201-
resource.TestCheckResourceAttr(testSqlserverInstanceResourceKey, "security_groups.#", "0"),
200+
resource.TestCheckResourceAttr(testSqlserverInstanceResourceKey, "security_groups.#", "1"),
202201
//resource.TestCheckNoResourceAttr(testSqlserverInstanceResourceKey, "tags.test"),
203202
//resource.TestCheckResourceAttr(testSqlserverInstanceResourceKey, "tags.abc", "abc"),
204203
),
@@ -339,7 +338,6 @@ data "tencentcloud_vpc_instances" "vpc" {
339338
340339
data "tencentcloud_security_group" "group" {}
341340
342-
343341
data "tencentcloud_subnet" "sub" {
344342
vpc_id = local.vpc_id
345343
subnet_id = local.vpc_subnet_id
@@ -428,7 +426,6 @@ resource "tencentcloud_sqlserver_instance" "test" {
428426
engine_version = "2017"
429427
charge_type = "POSTPAID_BY_HOUR"
430428
availability_zone = var.default_az
431-
charge_type = "POSTPAID_BY_HOUR"
432429
vpc_id = local.vpc_id
433430
subnet_id = local.subnet_id
434431
security_groups = [local.sg_id]

tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ resource "tencentcloud_sqlserver_instance" "subscribe_instance" {
125125
maintenance_week_set = [1,2,3]
126126
maintenance_start_time = "09:00"
127127
maintenance_time_span = 3
128-
security_groups = [tencentcloud_security_group.foo.name]
128+
security_groups = [local.sg_id]
129129
}
130130
131131
resource "tencentcloud_sqlserver_db" "test_publish_subscribe" {
@@ -158,7 +158,7 @@ resource "tencentcloud_sqlserver_instance" "publish_instance" {
158158
maintenance_week_set = [1,2,3]
159159
maintenance_start_time = "09:00"
160160
maintenance_time_span = 3
161-
security_groups = [tencentcloud_security_group.foo.name]
161+
security_groups = [local.sg_id]
162162
}
163163
164164
resource "tencentcloud_sqlserver_instance" "subscribe_instance" {
@@ -173,7 +173,7 @@ resource "tencentcloud_sqlserver_instance" "subscribe_instance" {
173173
maintenance_week_set = [1,2,3]
174174
maintenance_start_time = "09:00"
175175
maintenance_time_span = 3
176-
security_groups = [tencentcloud_security_group.foo.name]
176+
security_groups = [local.sg_id]
177177
}
178178
179179
resource "tencentcloud_sqlserver_db" "test_publish_subscribe" {

0 commit comments

Comments
 (0)