Skip to content

Commit 3f0bded

Browse files
KagashinoKagashino
authored
fix: add sqlserver instance name query and fix testcases (#950)
* fix: add sqlserver instance name query and fix testcases * fix: sqlserver_basic - test case spec
1 parent 15f3ec9 commit 3f0bded

15 files changed

+121
-72
lines changed

‎tencentcloud/data_source_tc_sqlserver_backups_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ func TestAccDataSourceTencentCloudSqlserverBackups(t *testing.T) {
3434
})
3535
}
3636

37-
const testAccTencentCloudDataSqlserverBackupsBasic = testAccSqlserverDB_basic + `
37+
const testAccTencentCloudDataSqlserverBackupsBasic = `
3838
data "tencentcloud_sqlserver_backups" "test"{
39-
instance_id = tencentcloud_sqlserver_instance.test.id
39+
instance_id = "mssql-ds1xhnt9"
4040
start_time = "2020-06-17 00:00:00"
41-
end_time = "2020-06-22 00:00:00"
41+
end_time = "2022-06-22 00:00:00"
4242
}
4343
`

‎tencentcloud/data_source_tc_sqlserver_basic_instances.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ func dataSourceTencentCloudSqlserverBasicInstances() *schema.Resource {
4343
Optional: true,
4444
Description: "ID of the SQL Server basic instance to be query.",
4545
},
46+
"name": {
47+
Type: schema.TypeString,
48+
Optional: true,
49+
Description: "Name of the SQL Server basic instance to be query.",
50+
},
4651
"project_id": {
4752
Type: schema.TypeInt,
4853
Optional: true,
@@ -171,6 +176,7 @@ func dataSourceTencentCloudSqlserverBasicInstanceRead(d *schema.ResourceData, me
171176
tagService = &TagService{client: tcClient}
172177
service = SqlserverService{client: tcClient}
173178
id = d.Get("id").(string)
179+
name = d.Get("name").(string)
174180
projectId = -1
175181
vpcId string
176182
subnetId string
@@ -184,7 +190,7 @@ func dataSourceTencentCloudSqlserverBasicInstanceRead(d *schema.ResourceData, me
184190
if v, ok := d.GetOk("subnet_id"); ok {
185191
subnetId = v.(string)
186192
}
187-
instanceList, err := service.DescribeSqlserverInstances(ctx, id, projectId, vpcId, subnetId, 1)
193+
instanceList, err := service.DescribeSqlserverInstances(ctx, id, name, projectId, vpcId, subnetId, 1)
188194
if err != nil {
189195
return err
190196
}

‎tencentcloud/data_source_tc_sqlserver_basic_instances_test.go‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ func TestAccDataSourceTencentCloudSqlserverBasicInstances(t *testing.T) {
2626
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.charge_type", "POSTPAID_BY_HOUR"),
2727
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.engine_version"),
2828
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.project_id", "0"),
29-
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.memory", "2"),
29+
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.memory", "4"),
3030
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.storage", "20"),
31-
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.cpu", "1"),
31+
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.cpu", "2"),
3232
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.vpc_id"),
3333
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.subnet_id"),
3434
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.availability_zone"),
@@ -43,18 +43,15 @@ func TestAccDataSourceTencentCloudSqlserverBasicInstances(t *testing.T) {
4343
})
4444
}
4545

46-
const testAccTencentCloudDataSqlserverBasicInstancesBasic = `
47-
variable "availability_zone"{
48-
default = "ap-guangzhou-3"
49-
}
46+
const testAccTencentCloudDataSqlserverBasicInstancesBasic = testAccSqlserverInstanceBasic + `
5047
5148
resource "tencentcloud_vpc" "foo" {
5249
name = "tf-sqlserver-vpc"
5350
cidr_block = "10.0.0.0/16"
5451
}
5552
5653
resource "tencentcloud_subnet" "foo" {
57-
availability_zone = var.availability_zone
54+
availability_zone = local.az1
5855
name = "tf-sqlserver-subnet"
5956
vpc_id = tencentcloud_vpc.foo.id
6057
cidr_block = "10.0.0.0/16"
@@ -63,15 +60,15 @@ resource "tencentcloud_subnet" "foo" {
6360
6461
resource "tencentcloud_sqlserver_basic_instance" "test" {
6562
name = "tf_sqlserver_basic_instance"
66-
availability_zone = var.availability_zone
63+
availability_zone = local.az1
6764
charge_type = "POSTPAID_BY_HOUR"
6865
vpc_id = tencentcloud_vpc.foo.id
6966
subnet_id = tencentcloud_subnet.foo.id
7067
machine_type = "CLOUD_PREMIUM"
7168
project_id = 0
72-
memory = 2
69+
memory = 4
7370
storage = 20
74-
cpu = 1
71+
cpu = 2
7572
security_groups = ["` + defaultSecurityGroup + `"]
7673
7774
tags = {

‎tencentcloud/data_source_tc_sqlserver_dbs_test.go‎

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

31-
const TestAccDataSourceTencentCloudSqlserverDB = testAccSqlserverDB_basic + `
31+
const TestAccDataSourceTencentCloudSqlserverDB = `
3232
data "tencentcloud_sqlserver_dbs" "foo" {
33-
instance_id = tencentcloud_sqlserver_db.mysqlserver_db.instance_id
33+
instance_id = "mssql-ds1xhnt9"
3434
}
3535
`

‎tencentcloud/data_source_tc_sqlserver_instances.go‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ func dataSourceTencentCloudSqlserverInstances() *schema.Resource {
3737
Optional: true,
3838
Description: "ID of the SQL Server instance to be query.",
3939
},
40+
"name": {
41+
Type: schema.TypeString,
42+
Optional: true,
43+
Description: "Name of the SQL Server instance to be query.",
44+
},
4045
"project_id": {
4146
Type: schema.TypeInt,
4247
Optional: true,
@@ -172,19 +177,21 @@ func dataSourceTencentCloudSqlserverInstanceRead(d *schema.ResourceData, meta in
172177

173178
id := d.Get("id").(string)
174179

175-
project_id := -1
180+
name := d.Get("name").(string)
181+
182+
projectId := -1
176183
if v, ok := d.GetOk("project_id"); ok {
177-
project_id = v.(int)
184+
projectId = v.(int)
178185
}
179186

180-
vpc_id := d.Get("vpc_id").(string)
187+
vpcId := d.Get("vpc_id").(string)
181188

182-
subnet_id := d.Get("subnet_id").(string)
189+
subnetId := d.Get("subnet_id").(string)
183190

184-
instanceList, err := service.DescribeSqlserverInstances(ctx, id, project_id, vpc_id, subnet_id, 1)
191+
instanceList, err := service.DescribeSqlserverInstances(ctx, id, name, projectId, vpcId, subnetId, 1)
185192

186193
if err != nil {
187-
instanceList, err = service.DescribeSqlserverInstances(ctx, id, project_id, vpc_id, subnet_id, 1)
194+
instanceList, err = service.DescribeSqlserverInstances(ctx, id, name, projectId, vpcId, subnetId, 1)
188195
}
189196
if err != nil {
190197
return err

‎tencentcloud/data_source_tc_sqlserver_instances_test.go‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
77
)
88

9-
var testDataSqlserverInstancesName = "data.tencentcloud_sqlserver_instances.id_test"
9+
var testDataSqlserverInstancesName = "data.tencentcloud_sqlserver_instances.test"
1010

1111
func TestAccDataSourceTencentCloudSqlserverInstances(t *testing.T) {
1212
t.Parallel()
@@ -18,16 +18,14 @@ func TestAccDataSourceTencentCloudSqlserverInstances(t *testing.T) {
1818
{
1919
Config: testAccTencentCloudDataSqlserverInstancesBasic,
2020
Check: resource.ComposeTestCheckFunc(
21-
testAccCheckSqlserverInstanceExists("tencentcloud_sqlserver_instance.test"),
22-
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.#", "1"),
21+
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.#"),
2322
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.id"),
2423
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.create_time"),
2524
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.id"),
2625
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.charge_type", "POSTPAID_BY_HOUR"),
2726
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.engine_version"),
28-
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.project_id", "0"),
29-
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.memory", "2"),
30-
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.storage", "10"),
27+
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.memory"),
28+
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.storage"),
3129
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.vip"),
3230
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.vport"),
3331
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.status"),
@@ -38,18 +36,9 @@ func TestAccDataSourceTencentCloudSqlserverInstances(t *testing.T) {
3836
})
3937
}
4038

41-
var testAccTencentCloudDataSqlserverInstancesBasic = testAccSqlserverInstanceBasic + `
39+
var testAccTencentCloudDataSqlserverInstancesBasic = `
4240
43-
resource "tencentcloud_sqlserver_instance" "test" {
44-
name = "tf_sqlserver_instance"
45-
availability_zone = local.az
46-
charge_type = "POSTPAID_BY_HOUR"
47-
project_id = 0
48-
memory = 2
49-
storage = 10
50-
}
51-
52-
data "tencentcloud_sqlserver_instances" "id_test"{
53-
id = tencentcloud_sqlserver_instance.test.id
41+
data "tencentcloud_sqlserver_instances" "test"{
42+
name = "keep"
5443
}
5544
`

‎tencentcloud/data_source_tc_sqlserver_readonly_groups_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccDataSourceTencentCloudSqlserverReadonlyGroups(t *testing.T) {
1818
{
1919
Config: testAccTencentCloudDataSqlserverReadonlyGroupsBasic,
2020
Check: resource.ComposeTestCheckFunc(
21-
resource.TestCheckResourceAttr(testDataSqlserverReadonlyGroupsName, "list.#", "2"),
21+
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.#"),
2222
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.0.vport"),
2323
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.0.vip"),
2424
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.0.min_instances"),
@@ -37,6 +37,6 @@ func TestAccDataSourceTencentCloudSqlserverReadonlyGroups(t *testing.T) {
3737

3838
const testAccTencentCloudDataSqlserverReadonlyGroupsBasic = `
3939
data "tencentcloud_sqlserver_readonly_groups" "test"{
40-
master_instance_id = "mssql-ixq78we9"
40+
master_instance_id = "mssql-ds1xhnt9"
4141
}
4242
`

‎tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestAccTencentCloudSqlserverAccountDBAttachmentResource(t *testing.T) {
2525
Check: resource.ComposeTestCheckFunc(
2626
testAccCheckSqlserverAccountDBAttachmentExists(testSqlserverAccountDBAttachmentResourceKey),
2727
resource.TestCheckResourceAttrSet(testSqlserverAccountDBAttachmentResourceKey, "instance_id"),
28-
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account"),
28+
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account_attach"),
2929
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "db_name", "test111"),
3030
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "privilege", "ReadOnly"),
3131
),
@@ -41,7 +41,7 @@ func TestAccTencentCloudSqlserverAccountDBAttachmentResource(t *testing.T) {
4141
Check: resource.ComposeTestCheckFunc(
4242
testAccCheckSqlserverAccountDBAttachmentExists(testSqlserverAccountDBAttachmentResourceKey),
4343
resource.TestCheckResourceAttrSet(testSqlserverAccountDBAttachmentResourceKey, "instance_id"),
44-
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account"),
44+
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account_attach"),
4545
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "db_name", "test111"),
4646
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "privilege", "ReadWrite"),
4747
),
@@ -117,44 +117,44 @@ func testAccCheckSqlserverAccountDBAttachmentExists(n string) resource.TestCheck
117117
}
118118
}
119119

120-
const testAccSqlserverAccountDBAttachment string = testAccSqlserverInstance + `
120+
const testAccSqlserverAccountDBAttachment string = CommonPresetSQLServer + `
121121
resource "tencentcloud_sqlserver_account" "test" {
122-
instance_id = tencentcloud_sqlserver_instance.test.id
123-
name = "tf_sqlserver_account"
122+
instance_id = local.sqlserver_id
123+
name = "tf_sqlserver_account_attach"
124124
password = "testt123"
125125
}
126126
127127
resource "tencentcloud_sqlserver_db" "test" {
128-
instance_id = tencentcloud_sqlserver_instance.test.id
128+
instance_id = local.sqlserver_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 = tencentcloud_sqlserver_instance.test.id
135+
instance_id = local.sqlserver_id
136136
account_name = tencentcloud_sqlserver_account.test.name
137137
db_name = tencentcloud_sqlserver_db.test.name
138138
privilege = "ReadOnly"
139139
}
140140
`
141141

142-
const testAccSqlserverAccountDBAttachmentUpdate string = testAccSqlserverInstance + `
142+
const testAccSqlserverAccountDBAttachmentUpdate string = CommonPresetSQLServer + `
143143
resource "tencentcloud_sqlserver_account" "test" {
144-
instance_id = tencentcloud_sqlserver_instance.test.id
145-
name = "tf_sqlserver_account"
144+
instance_id = local.sqlserver_id
145+
name = "tf_sqlserver_account_attach"
146146
password = "testt123"
147147
}
148148
149149
resource "tencentcloud_sqlserver_db" "test" {
150-
instance_id = tencentcloud_sqlserver_instance.test.id
150+
instance_id = local.sqlserver_id
151151
name = "test111"
152152
charset = "Chinese_PRC_BIN"
153153
remark = "testACC-remark"
154154
}
155155
156156
resource "tencentcloud_sqlserver_account_db_attachment" "test" {
157-
instance_id = tencentcloud_sqlserver_instance.test.id
157+
instance_id = local.sqlserver_id
158158
account_name = tencentcloud_sqlserver_account.test.name
159159
db_name = tencentcloud_sqlserver_db.test.name
160160
privilege = "ReadWrite"

‎tencentcloud/resource_tc_sqlserver_account_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,17 @@ func testAccCheckSqlserverAccountExists(n string) resource.TestCheckFunc {
125125
}
126126
}
127127

128-
const testAccSqlserverAccount string = testAccSqlserverInstance + `
128+
const testAccSqlserverAccount string = CommonPresetSQLServer + `
129129
resource "tencentcloud_sqlserver_account" "test" {
130-
instance_id = tencentcloud_sqlserver_instance.test.id
130+
instance_id = local.sqlserver_id
131131
name = "tf_sqlserver_account"
132132
password = "testt123"
133133
}
134134
`
135135

136-
const testAccSqlserverAccountUpdate string = testAccSqlserverInstance + `
136+
const testAccSqlserverAccountUpdate string = CommonPresetSQLServer + `
137137
resource "tencentcloud_sqlserver_account" "test" {
138-
instance_id = tencentcloud_sqlserver_instance.test.id
138+
instance_id = local.sqlserver_id
139139
name = "tf_sqlserver_account"
140140
password = "test1233"
141141
remark = "testt"

‎tencentcloud/resource_tc_sqlserver_basic_instance_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ func TestAccTencentCloudSqlserverBasicInstanceResource(t *testing.T) {
2828
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "charge_type", "POSTPAID_BY_HOUR"),
2929
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "vpc_id"),
3030
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "subnet_id"),
31-
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "2"),
31+
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "4"),
3232
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "storage", "20"),
33-
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "1"),
33+
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "2"),
3434
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "machine_type", "CLOUD_PREMIUM"),
3535
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "project_id", "0"),
3636
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "create_time"),
@@ -58,9 +58,9 @@ func TestAccTencentCloudSqlserverBasicInstanceResource(t *testing.T) {
5858
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "maintenance_start_time", "08:00"),
5959
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "maintenance_time_span", "4"),
6060
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "maintenance_week_set.#", "4"),
61-
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "4"),
61+
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "8"),
6262
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "storage", "100"),
63-
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "1"),
63+
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "2"),
6464
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "machine_type", "CLOUD_PREMIUM"),
6565
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "create_time"),
6666
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "project_id", "0"),
@@ -153,9 +153,9 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
153153
subnet_id = tencentcloud_subnet.foo.id
154154
security_groups = ["` + defaultSecurityGroup + `"]
155155
project_id = 0
156-
memory = 2
156+
memory = 4
157157
storage = 20
158-
cpu = 1
158+
cpu = 2
159159
machine_type = "CLOUD_PREMIUM"
160160
maintenance_week_set = [1,2,3]
161161
maintenance_start_time = "09:00"
@@ -176,9 +176,9 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
176176
subnet_id = tencentcloud_subnet.foo.id
177177
security_groups = ["` + defaultSecurityGroup + `"]
178178
project_id = 0
179-
memory = 4
179+
memory = 8
180180
storage = 100
181-
cpu = 1
181+
cpu = 2
182182
machine_type = "CLOUD_PREMIUM"
183183
maintenance_week_set = [1,2,3,4]
184184
maintenance_start_time = "08:00"

0 commit comments

Comments
 (0)