Skip to content

Commit 2461d9c

Browse files
gailwanggailwang
committed
fix bugs
1 parent ba73521 commit 2461d9c

20 files changed

+115
-94
lines changed

‎examples/tencentcloud-sqlserver/main.tf‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
data "tencentcloud_sqlserver_zone_configs" "foo" {
1+
data "tencentcloud_sqlserver_zone_config" "foo" {
22
}
33

44
resource "tencentcloud_vpc" "foo" {
@@ -48,16 +48,16 @@ resource "tencentcloud_sqlserver_account_db_attachment" "example" {
4848
}
4949

5050
resource "tencentcloud_sqlserver_readonly_instance" "example" {
51-
name = "example"
52-
availability_zone = var.availability_zone
53-
charge_type = "POSTPAID_BY_HOUR"
54-
vpc_id = tencentcloud_vpc.foo.id
55-
subnet_id = tencentcloud_subnet.foo.id
56-
memory = 4
57-
storage = 20
58-
master_instance_id = tencentcloud_sqlserver_instance.test.id
51+
name = "example"
52+
availability_zone = var.availability_zone
53+
charge_type = "POSTPAID_BY_HOUR"
54+
vpc_id = tencentcloud_vpc.foo.id
55+
subnet_id = tencentcloud_subnet.foo.id
56+
memory = 4
57+
storage = 20
58+
master_instance_id = tencentcloud_sqlserver_instance.test.id
5959
readonly_group_type = 1
60-
force_upgrade = true
60+
force_upgrade = true
6161
}
6262

6363

@@ -93,7 +93,7 @@ data "tencentcloud_sqlserver_backups" "example" {
9393
end_time = "2020-07-01 00:00:00"
9494
}
9595

96-
data "tencentcloud_sqlserver_readonly_groups" "example"{
97-
master_instance_id = tencentcloud_sqlserver_instance.example.id
96+
data "tencentcloud_sqlserver_readonly_groups" "example" {
97+
master_instance_id = tencentcloud_sqlserver_instance.example.id
9898
}
9999

‎go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,6 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
458458
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
459459
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
460460
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
461-
github.com/tencentcloud/tencentcloud-sdk-go v3.0.217+incompatible h1:c0N5XTxnRv3e6lgIEw3Ml0RdIV0fA8qDRuVEhQnDViE=
462-
github.com/tencentcloud/tencentcloud-sdk-go v3.0.217+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
463461
github.com/tencentcloud/tencentcloud-sdk-go v3.0.221+incompatible h1:KfLv0pH+sYexx2FcvvPhek5kfiI14JB9JCTMkEWrNVE=
464462
github.com/tencentcloud/tencentcloud-sdk-go v3.0.221+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
465463
github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=

‎tencentcloud/data_source_tc_sqlserver_account_db_attachments.go‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,9 @@ Use this data source to query the list of SQL Server account DB privileges.
44
Example Usage
55
66
```hcl
7-
data "tencentcloud_sqlserver_accounts" "account" {
8-
instance_id = "mssql-3cdq7kx5"
9-
account_name = "myaccount"
10-
}
11-
12-
data "tencentcloud_sqlserver_accounts" "db" {
13-
instance_id = "mssql-3cdq7kx5"
14-
db_name = "mydb"
15-
}
16-
17-
data "tencentcloud_sqlserver_accounts" "instance" {
18-
instance_id = "mssql-3cdq7kx5"
7+
data "tencentcloud_sqlserver_account_db_attachments" "test"{
8+
instance_id = tencentcloud_sqlserver_instance.test.id
9+
account_name = tencentcloud_sqlserver_account_db_attachment.test.account_name
1910
}
2011
```
2112
*/
@@ -49,7 +40,7 @@ func dataSourceTencentCloudSqlserverAccountDBAttachments() *schema.Resource {
4940
Type: schema.TypeString,
5041
Optional: true,
5142
Default: "",
52-
Description: "Name of the SQL Server account to be queried.",
43+
Description: "Name of the DB to be queried.",
5344
},
5445
"result_output_file": {
5546
Type: schema.TypeString,
@@ -81,7 +72,7 @@ func dataSourceTencentCloudSqlserverAccountDBAttachments() *schema.Resource {
8172
"privilege": {
8273
Type: schema.TypeString,
8374
Computed: true,
84-
Description: "Privilege of the account on DB. Valid value are `READONLY`, `ReadWrite`.",
75+
Description: "Privilege of the account on DB. Valid value are `ReadOnly`, `ReadWrite`.",
8576
},
8677
},
8778
},
@@ -91,7 +82,7 @@ func dataSourceTencentCloudSqlserverAccountDBAttachments() *schema.Resource {
9182
}
9283

9384
func dataSourceTencentSqlserverAccountDBAttachmentsRead(d *schema.ResourceData, meta interface{}) error {
94-
defer logElapsed("data_source.tencentcloud_sqlserver_backup_list.read")()
85+
defer logElapsed("data_source.tencentcloud_sqlserver_account_db_attachments.read")()
9586

9687
logId := getLogId(contextNil)
9788
ctx := context.WithValue(context.TODO(), logIdKey, logId)

‎tencentcloud/data_source_tc_sqlserver_accounts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func dataSourceTencentCloudSqlserverAccounts() *schema.Resource {
9090
}
9191

9292
func dataSourceTencentSqlserverAccountsRead(d *schema.ResourceData, meta interface{}) error {
93-
defer logElapsed("data_source.tencentcloud_sqlserver_backup_list.read")()
93+
defer logElapsed("data_source.tencentcloud_sqlserver_accounts.read")()
9494

9595
logId := getLogId(contextNil)
9696
ctx := context.WithValue(context.TODO(), logIdKey, logId)

‎tencentcloud/data_source_tc_sqlserver_dbs.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Use this data source to query DB resources for the specific SQL Server instance.
44
Example Usage
55
66
```hcl
7-
data "tencentcloud_sqlserver_db" "example" {
7+
data "tencentcloud_sqlserver_dbs" "example" {
88
instance_id = "mssql-3cdq7kx5"
99
}
1010
```
@@ -31,7 +31,7 @@ func dataSourceTencentSqlserverDBs() *schema.Resource {
3131
"instance_id": {
3232
Type: schema.TypeString,
3333
Required: true,
34-
Description: "SQLServer instance ID which DB belongs to.",
34+
Description: "SQL Server instance ID which DB belongs to.",
3535
},
3636
// Computed
3737
"db_list": {
@@ -43,7 +43,7 @@ func dataSourceTencentSqlserverDBs() *schema.Resource {
4343
"instance_id": {
4444
Type: schema.TypeString,
4545
Computed: true,
46-
Description: "SQLServer instance ID which DB belongs to.",
46+
Description: "SQL Server instance ID which DB belongs to.",
4747
},
4848
"name": {
4949
Type: schema.TypeString,
@@ -53,7 +53,7 @@ func dataSourceTencentSqlserverDBs() *schema.Resource {
5353
"charset": {
5454
Type: schema.TypeString,
5555
Computed: true,
56-
Description: "Character set DB uses, could be `Chinese_PRC_CI_AS`, `Chinese_PRC_CS_AS`, `Chinese_PRC_BIN`, `Chinese_Taiwan_Stroke_CI_AS`, `SQL_Latin1_General_CP1_CI_AS`, and `SQL_Latin1_General_CP1_CS_AS`. Default value is `Chinese_PRC_CI_AS`.",
56+
Description: "Character set DB uses, could be `Chinese_PRC_CI_AS`, `Chinese_PRC_CS_AS`, `Chinese_PRC_BIN`, `Chinese_Taiwan_Stroke_CI_AS`, `SQL_Latin1_General_CP1_CI_AS`, and `SQL_Latin1_General_CP1_CS_AS`.",
5757
},
5858
"remark": {
5959
Type: schema.TypeString,
@@ -78,7 +78,7 @@ func dataSourceTencentSqlserverDBs() *schema.Resource {
7878
}
7979

8080
func dataSourceTencentSqlserverDBRead(d *schema.ResourceData, meta interface{}) error {
81-
defer logElapsed("data_source.tencent_sqlserver_db.read")()
81+
defer logElapsed("data_source.tencent_sqlserver_dbs.read")()
8282

8383
logId := getLogId(contextNil)
8484
ctx := context.WithValue(context.TODO(), logIdKey, logId)

‎tencentcloud/data_source_tc_sqlserver_readonly_groups.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Use this data source to query the list of SQL Server backups.
2+
Use this data source to query the list of SQL Server readonly groups.
33
44
Example Usage
55

‎tencentcloud/data_source_tc_sqlserver_zone_configs.go‎ renamed to ‎tencentcloud/data_source_tc_sqlserver_zone_config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Use this data source to query purchasable specification configuration for each a
44
Example Usage
55
66
```hcl
7-
data "tencentcloud_sqlserver_zone_configs" "mysqlserver" {
7+
data "tencentcloud_sqlserver_zone_config" "mysqlserver" {
88
}
99
```
1010
*/
@@ -18,7 +18,7 @@ import (
1818
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1919
)
2020

21-
func dataSourceTencentSqlserverZoneConfigs() *schema.Resource {
21+
func dataSourceTencentSqlserverZoneConfig() *schema.Resource {
2222
return &schema.Resource{
2323
Read: dataSourceTencentSqlserverZoneConfigRead,
2424
Schema: map[string]*schema.Schema{

‎tencentcloud/data_source_tc_sqlserver_zone_configs_test.go‎ renamed to ‎tencentcloud/data_source_tc_sqlserver_zone_config_test.go‎

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

9-
func TestAccDataSourceTencentCloudSqlserverZoneConfigs_basic(t *testing.T) {
9+
func TestAccDataSourceTencentCloudSqlserverZoneConfig_basic(t *testing.T) {
1010
resource.Test(t, resource.TestCase{
1111
PreCheck: func() { testAccPreCheck(t) },
1212
Providers: testAccProviders,
1313
Steps: []resource.TestStep{
1414
{
1515
Config: TestAccDataSourceTencentCloudSqlserverZoneConfig,
1616
Check: resource.ComposeTestCheckFunc(
17-
testAccCheckTencentCloudDataSourceID("data.tencentcloud_sqlserver_zone_configs.foo"),
18-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.availability_zone"),
19-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.zone_id"),
20-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.spec_id"),
21-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.machine_type"),
22-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.db_version"),
23-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.db_version_name"),
24-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.memory"),
25-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.cpu"),
26-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.min_storage_size"),
27-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.max_storage_size"),
28-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.qps"),
29-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_configs.foo", "zone_list.0.specinfo_list.0.charge_type"),
17+
testAccCheckTencentCloudDataSourceID("data.tencentcloud_sqlserver_zone_config.foo"),
18+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.availability_zone"),
19+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.zone_id"),
20+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.spec_id"),
21+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.machine_type"),
22+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.db_version"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.db_version_name"),
24+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.memory"),
25+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.cpu"),
26+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.min_storage_size"),
27+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.max_storage_size"),
28+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.qps"),
29+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_zone_config.foo", "zone_list.0.specinfo_list.0.charge_type"),
3030
),
3131
},
3232
},
3333
})
3434
}
3535

3636
const TestAccDataSourceTencentCloudSqlserverZoneConfig = `
37-
data "tencentcloud_sqlserver_zone_configs" "foo" {
37+
data "tencentcloud_sqlserver_zone_config" "foo" {
3838
}
3939
`

‎tencentcloud/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ func Provider() terraform.ResourceProvider {
614614
"tencentcloud_elasticsearch_instances": dataSourceTencentCloudElasticsearchInstances(),
615615
"tencentcloud_postgresql_instances": dataSourceTencentCloudPostgresqlInstances(),
616616
"tencentcloud_postgresql_specinfos": dataSourceTencentCloudPostgresqlSpecinfos(),
617-
"tencentcloud_sqlserver_zone_configs": dataSourceTencentSqlserverZoneConfigs(),
617+
"tencentcloud_sqlserver_zone_config": dataSourceTencentSqlserverZoneConfig(),
618618
"tencentcloud_sqlserver_instances": dataSourceTencentCloudSqlserverInstances(),
619619
"tencentcloud_sqlserver_backups": dataSourceTencentCloudSqlserverBackups(),
620620
"tencentcloud_sqlserver_dbs": dataSourceTencentSqlserverDBs(),

‎tencentcloud/resource_tc_gaap_http_domain_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ resource tencentcloud_gaap_layer7_listener "foo" {
504504
port = 80
505505
proxy_id = "%s"
506506
certificate_id = tencentcloud_gaap_certificate.foo.id
507-
client_certificate_ids = [tencentcloud_gaap_certificate.bar.id]
507+
client_certificate_ids = [tencentcloud_gaap_certificate.bar.id]
508508
forward_protocol = "HTTPS"
509509
auth_type = 1
510510
}

0 commit comments

Comments
 (0)