Skip to content

fix: add sqlserver instance name query and fix testcases #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 12, 2022
Merged

fix: add sqlserver instance name query and fix testcases #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70f62ec
fix: add sqlserver instance name query and fix testcases
Kagashino Apr 12, 2022
2ec5fa7
fix: sqlserver_basic - test case spec
Kagashino Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tencentcloud/data_source_tc_sqlserver_backups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ func TestAccDataSourceTencentCloudSqlserverBackups(t *testing.T) {
})
}

const testAccTencentCloudDataSqlserverBackupsBasic = testAccSqlserverDB_basic + `
const testAccTencentCloudDataSqlserverBackupsBasic = `
data "tencentcloud_sqlserver_backups" "test"{
instance_id = tencentcloud_sqlserver_instance.test.id
instance_id = "mssql-ds1xhnt9"
start_time = "2020-06-17 00:00:00"
end_time = "2020-06-22 00:00:00"
end_time = "2022-06-22 00:00:00"
}
`
8 changes: 7 additions & 1 deletion tencentcloud/data_source_tc_sqlserver_basic_instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ func dataSourceTencentCloudSqlserverBasicInstances() *schema.Resource {
Optional: true,
Description: "ID of the SQL Server basic instance to be query.",
},
"name": {
Type: schema.TypeString,
Optional: true,
Description: "Name of the SQL Server basic instance to be query.",
},
"project_id": {
Type: schema.TypeInt,
Optional: true,
Expand Down Expand Up @@ -171,6 +176,7 @@ func dataSourceTencentCloudSqlserverBasicInstanceRead(d *schema.ResourceData, me
tagService = &TagService{client: tcClient}
service = SqlserverService{client: tcClient}
id = d.Get("id").(string)
name = d.Get("name").(string)
projectId = -1
vpcId string
subnetId string
Expand All @@ -184,7 +190,7 @@ func dataSourceTencentCloudSqlserverBasicInstanceRead(d *schema.ResourceData, me
if v, ok := d.GetOk("subnet_id"); ok {
subnetId = v.(string)
}
instanceList, err := service.DescribeSqlserverInstances(ctx, id, projectId, vpcId, subnetId, 1)
instanceList, err := service.DescribeSqlserverInstances(ctx, id, name, projectId, vpcId, subnetId, 1)
if err != nil {
return err
}
Expand Down
17 changes: 7 additions & 10 deletions tencentcloud/data_source_tc_sqlserver_basic_instances_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ func TestAccDataSourceTencentCloudSqlserverBasicInstances(t *testing.T) {
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.charge_type", "POSTPAID_BY_HOUR"),
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.engine_version"),
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.project_id", "0"),
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.memory", "2"),
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.memory", "4"),
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.storage", "20"),
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.cpu", "1"),
resource.TestCheckResourceAttr(testDataSqlserverBasicInstancesName, "instance_list.0.cpu", "2"),
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.vpc_id"),
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.subnet_id"),
resource.TestCheckResourceAttrSet(testDataSqlserverBasicInstancesName, "instance_list.0.availability_zone"),
Expand All @@ -43,18 +43,15 @@ func TestAccDataSourceTencentCloudSqlserverBasicInstances(t *testing.T) {
})
}

const testAccTencentCloudDataSqlserverBasicInstancesBasic = `
variable "availability_zone"{
default = "ap-guangzhou-3"
}
const testAccTencentCloudDataSqlserverBasicInstancesBasic = testAccSqlserverInstanceBasic + `

resource "tencentcloud_vpc" "foo" {
name = "tf-sqlserver-vpc"
cidr_block = "10.0.0.0/16"
}

resource "tencentcloud_subnet" "foo" {
availability_zone = var.availability_zone
availability_zone = local.az1
name = "tf-sqlserver-subnet"
vpc_id = tencentcloud_vpc.foo.id
cidr_block = "10.0.0.0/16"
Expand All @@ -63,15 +60,15 @@ resource "tencentcloud_subnet" "foo" {

resource "tencentcloud_sqlserver_basic_instance" "test" {
name = "tf_sqlserver_basic_instance"
availability_zone = var.availability_zone
availability_zone = local.az1
charge_type = "POSTPAID_BY_HOUR"
vpc_id = tencentcloud_vpc.foo.id
subnet_id = tencentcloud_subnet.foo.id
machine_type = "CLOUD_PREMIUM"
project_id = 0
memory = 2
memory = 4
storage = 20
cpu = 1
cpu = 2
security_groups = ["` + defaultSecurityGroup + `"]

tags = {
Expand Down
4 changes: 2 additions & 2 deletions tencentcloud/data_source_tc_sqlserver_dbs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func TestAccDataSourceTencentCloudSqlserverDBs_basic(t *testing.T) {
})
}

const TestAccDataSourceTencentCloudSqlserverDB = testAccSqlserverDB_basic + `
const TestAccDataSourceTencentCloudSqlserverDB = `
data "tencentcloud_sqlserver_dbs" "foo" {
instance_id = tencentcloud_sqlserver_db.mysqlserver_db.instance_id
instance_id = "mssql-ds1xhnt9"
}
`
19 changes: 13 additions & 6 deletions tencentcloud/data_source_tc_sqlserver_instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ func dataSourceTencentCloudSqlserverInstances() *schema.Resource {
Optional: true,
Description: "ID of the SQL Server instance to be query.",
},
"name": {
Type: schema.TypeString,
Optional: true,
Description: "Name of the SQL Server instance to be query.",
},
"project_id": {
Type: schema.TypeInt,
Optional: true,
Expand Down Expand Up @@ -172,19 +177,21 @@ func dataSourceTencentCloudSqlserverInstanceRead(d *schema.ResourceData, meta in

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

project_id := -1
name := d.Get("name").(string)

projectId := -1
if v, ok := d.GetOk("project_id"); ok {
project_id = v.(int)
projectId = v.(int)
}

vpc_id := d.Get("vpc_id").(string)
vpcId := d.Get("vpc_id").(string)

subnet_id := d.Get("subnet_id").(string)
subnetId := d.Get("subnet_id").(string)

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

if err != nil {
instanceList, err = service.DescribeSqlserverInstances(ctx, id, project_id, vpc_id, subnet_id, 1)
instanceList, err = service.DescribeSqlserverInstances(ctx, id, name, projectId, vpcId, subnetId, 1)
}
if err != nil {
return err
Expand Down
25 changes: 7 additions & 18 deletions tencentcloud/data_source_tc_sqlserver_instances_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
)

var testDataSqlserverInstancesName = "data.tencentcloud_sqlserver_instances.id_test"
var testDataSqlserverInstancesName = "data.tencentcloud_sqlserver_instances.test"

func TestAccDataSourceTencentCloudSqlserverInstances(t *testing.T) {
t.Parallel()
Expand All @@ -18,16 +18,14 @@ func TestAccDataSourceTencentCloudSqlserverInstances(t *testing.T) {
{
Config: testAccTencentCloudDataSqlserverInstancesBasic,
Check: resource.ComposeTestCheckFunc(
testAccCheckSqlserverInstanceExists("tencentcloud_sqlserver_instance.test"),
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.#", "1"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.#"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.id"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.create_time"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.id"),
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.charge_type", "POSTPAID_BY_HOUR"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.engine_version"),
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.project_id", "0"),
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.memory", "2"),
resource.TestCheckResourceAttr(testDataSqlserverInstancesName, "instance_list.0.storage", "10"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.memory"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.storage"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.vip"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.vport"),
resource.TestCheckResourceAttrSet(testDataSqlserverInstancesName, "instance_list.0.status"),
Expand All @@ -38,18 +36,9 @@ func TestAccDataSourceTencentCloudSqlserverInstances(t *testing.T) {
})
}

var testAccTencentCloudDataSqlserverInstancesBasic = testAccSqlserverInstanceBasic + `
var testAccTencentCloudDataSqlserverInstancesBasic = `

resource "tencentcloud_sqlserver_instance" "test" {
name = "tf_sqlserver_instance"
availability_zone = local.az
charge_type = "POSTPAID_BY_HOUR"
project_id = 0
memory = 2
storage = 10
}

data "tencentcloud_sqlserver_instances" "id_test"{
id = tencentcloud_sqlserver_instance.test.id
data "tencentcloud_sqlserver_instances" "test"{
name = "keep"
}
`
4 changes: 2 additions & 2 deletions tencentcloud/data_source_tc_sqlserver_readonly_groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestAccDataSourceTencentCloudSqlserverReadonlyGroups(t *testing.T) {
{
Config: testAccTencentCloudDataSqlserverReadonlyGroupsBasic,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(testDataSqlserverReadonlyGroupsName, "list.#", "2"),
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.#"),
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.0.vport"),
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.0.vip"),
resource.TestCheckResourceAttrSet(testDataSqlserverReadonlyGroupsName, "list.0.min_instances"),
Expand All @@ -37,6 +37,6 @@ func TestAccDataSourceTencentCloudSqlserverReadonlyGroups(t *testing.T) {

const testAccTencentCloudDataSqlserverReadonlyGroupsBasic = `
data "tencentcloud_sqlserver_readonly_groups" "test"{
master_instance_id = "mssql-ixq78we9"
master_instance_id = "mssql-ds1xhnt9"
}
`
24 changes: 12 additions & 12 deletions tencentcloud/resource_tc_sqlserver_account_db_attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestAccTencentCloudSqlserverAccountDBAttachmentResource(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckSqlserverAccountDBAttachmentExists(testSqlserverAccountDBAttachmentResourceKey),
resource.TestCheckResourceAttrSet(testSqlserverAccountDBAttachmentResourceKey, "instance_id"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account_attach"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "db_name", "test111"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "privilege", "ReadOnly"),
),
Expand All @@ -41,7 +41,7 @@ func TestAccTencentCloudSqlserverAccountDBAttachmentResource(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckSqlserverAccountDBAttachmentExists(testSqlserverAccountDBAttachmentResourceKey),
resource.TestCheckResourceAttrSet(testSqlserverAccountDBAttachmentResourceKey, "instance_id"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "account_name", "tf_sqlserver_account_attach"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "db_name", "test111"),
resource.TestCheckResourceAttr(testSqlserverAccountDBAttachmentResourceKey, "privilege", "ReadWrite"),
),
Expand Down Expand Up @@ -117,44 +117,44 @@ func testAccCheckSqlserverAccountDBAttachmentExists(n string) resource.TestCheck
}
}

const testAccSqlserverAccountDBAttachment string = testAccSqlserverInstance + `
const testAccSqlserverAccountDBAttachment string = CommonPresetSQLServer + `
resource "tencentcloud_sqlserver_account" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
name = "tf_sqlserver_account"
instance_id = local.sqlserver_id
name = "tf_sqlserver_account_attach"
password = "testt123"
}

resource "tencentcloud_sqlserver_db" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
instance_id = local.sqlserver_id
name = "test111"
charset = "Chinese_PRC_BIN"
remark = "testACC-remark"
}

resource "tencentcloud_sqlserver_account_db_attachment" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
instance_id = local.sqlserver_id
account_name = tencentcloud_sqlserver_account.test.name
db_name = tencentcloud_sqlserver_db.test.name
privilege = "ReadOnly"
}
`

const testAccSqlserverAccountDBAttachmentUpdate string = testAccSqlserverInstance + `
const testAccSqlserverAccountDBAttachmentUpdate string = CommonPresetSQLServer + `
resource "tencentcloud_sqlserver_account" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
name = "tf_sqlserver_account"
instance_id = local.sqlserver_id
name = "tf_sqlserver_account_attach"
password = "testt123"
}

resource "tencentcloud_sqlserver_db" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
instance_id = local.sqlserver_id
name = "test111"
charset = "Chinese_PRC_BIN"
remark = "testACC-remark"
}

resource "tencentcloud_sqlserver_account_db_attachment" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
instance_id = local.sqlserver_id
account_name = tencentcloud_sqlserver_account.test.name
db_name = tencentcloud_sqlserver_db.test.name
privilege = "ReadWrite"
Expand Down
8 changes: 4 additions & 4 deletions tencentcloud/resource_tc_sqlserver_account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,17 @@ func testAccCheckSqlserverAccountExists(n string) resource.TestCheckFunc {
}
}

const testAccSqlserverAccount string = testAccSqlserverInstance + `
const testAccSqlserverAccount string = CommonPresetSQLServer + `
resource "tencentcloud_sqlserver_account" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
instance_id = local.sqlserver_id
name = "tf_sqlserver_account"
password = "testt123"
}
`

const testAccSqlserverAccountUpdate string = testAccSqlserverInstance + `
const testAccSqlserverAccountUpdate string = CommonPresetSQLServer + `
resource "tencentcloud_sqlserver_account" "test" {
instance_id = tencentcloud_sqlserver_instance.test.id
instance_id = local.sqlserver_id
name = "tf_sqlserver_account"
password = "test1233"
remark = "testt"
Expand Down
16 changes: 8 additions & 8 deletions tencentcloud/resource_tc_sqlserver_basic_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ func TestAccTencentCloudSqlserverBasicInstanceResource(t *testing.T) {
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "charge_type", "POSTPAID_BY_HOUR"),
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "vpc_id"),
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "subnet_id"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "2"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "4"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "storage", "20"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "1"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "2"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "machine_type", "CLOUD_PREMIUM"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "project_id", "0"),
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "create_time"),
Expand Down Expand Up @@ -58,9 +58,9 @@ func TestAccTencentCloudSqlserverBasicInstanceResource(t *testing.T) {
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "maintenance_start_time", "08:00"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "maintenance_time_span", "4"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "maintenance_week_set.#", "4"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "4"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "memory", "8"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "storage", "100"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "1"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "cpu", "2"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "machine_type", "CLOUD_PREMIUM"),
resource.TestCheckResourceAttrSet(testSqlserverBasicInstanceResourceKey, "create_time"),
resource.TestCheckResourceAttr(testSqlserverBasicInstanceResourceKey, "project_id", "0"),
Expand Down Expand Up @@ -153,9 +153,9 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
subnet_id = tencentcloud_subnet.foo.id
security_groups = ["` + defaultSecurityGroup + `"]
project_id = 0
memory = 2
memory = 4
storage = 20
cpu = 1
cpu = 2
machine_type = "CLOUD_PREMIUM"
maintenance_week_set = [1,2,3]
maintenance_start_time = "09:00"
Expand All @@ -176,9 +176,9 @@ resource "tencentcloud_sqlserver_basic_instance" "test" {
subnet_id = tencentcloud_subnet.foo.id
security_groups = ["` + defaultSecurityGroup + `"]
project_id = 0
memory = 4
memory = 8
storage = 100
cpu = 1
cpu = 2
machine_type = "CLOUD_PREMIUM"
maintenance_week_set = [1,2,3,4]
maintenance_start_time = "08:00"
Expand Down
Loading