Skip to content

Commit 8e506d1

Browse files
SevenEarthSevenEarth
authored
fix/sqlserver (#1960)
* fix/sqlserver * fix/sqlserver
1 parent ea98e81 commit 8e506d1

9 files changed

+98
-71
lines changed

‎tencentcloud/data_source_tc_sqlserver_backups.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Use this data source to query the list of SQL Server backups.
44
Example Usage
55
66
```hcl
7-
data "tencentcloud_sqlserver_backups" "foo" {
8-
instance_id = "mssql-3cdq7kx5"
9-
start_time = "2020-06-17 00:00:00"
10-
end_time = "2020-06-22 00:00:00"
7+
data "tencentcloud_sqlserver_backups" "example" {
8+
instance_id = "mssql-qelbzgwf"
9+
start_time = "2020-06-17 00:00:00"
10+
end_time = "2020-06-22 00:00:00"
1111
}
1212
```
1313
*/

‎tencentcloud/resource_tc_api_gateway_api_doc_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@ func testAccCheckAPIGatewayAPIDocExists(r string) resource.TestCheckFunc {
106106
const testAccAPIGatewayAPIDoc = `
107107
resource "tencentcloud_api_gateway_api_doc" "test" {
108108
api_doc_name = "doc_test1"
109-
service_id = "service-7lybgojo"
109+
service_id = "service-nxz6yync"
110110
environment = "release"
111-
api_ids = ["api-2bntitvw"]
111+
api_ids = ["api-jvqlzolk"]
112112
}
113113
`
114114

115115
const testAccAPIGatewayAPIDocUpdate = `
116116
resource "tencentcloud_api_gateway_api_doc" "test" {
117117
api_doc_name = "update_doc_name_test"
118-
service_id = "service-7lybgojo"
118+
service_id = "service-nxz6yync"
119119
environment = "release"
120-
api_ids = ["api-2bntitvw"]
120+
api_ids = ["api-jvqlzolk"]
121121
}
122122
`

‎tencentcloud/resource_tc_api_gateway_custom_domain_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestAccTencentCloudAPIGateWayCustomDomain_basic(t *testing.T) {
2222
Config: testAccCustomDomain,
2323
Check: resource.ComposeTestCheckFunc(
2424
testAccCheckCustomDomainExists("tencentcloud_api_gateway_custom_domain.foo"),
25-
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-7lybgojo"),
25+
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-nxz6yync"),
2626
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "sub_domain", "tic-test.dnsv1.com"),
2727
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "protocol", "http"),
2828
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "net_type", "OUTER"),
@@ -35,7 +35,7 @@ func TestAccTencentCloudAPIGateWayCustomDomain_basic(t *testing.T) {
3535
Config: testAccCustomDomainUpdate,
3636
Check: resource.ComposeTestCheckFunc(
3737
testAccCheckCustomDomainExists("tencentcloud_api_gateway_custom_domain.foo"),
38-
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-7lybgojo"),
38+
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "service_id", "service-nxz6yync"),
3939
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "sub_domain", "tic-test.dnsv1.com"),
4040
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "protocol", "http"),
4141
resource.TestCheckResourceAttr("tencentcloud_api_gateway_custom_domain.foo", "net_type", "OUTER"),
@@ -113,7 +113,7 @@ func testAccCheckCustomDomainExists(n string) resource.TestCheckFunc {
113113

114114
const testAccCustomDomain = `
115115
resource "tencentcloud_api_gateway_custom_domain" "foo" {
116-
service_id = "service-7lybgojo"
116+
service_id = "service-nxz6yync"
117117
sub_domain = "tic-test.dnsv1.com"
118118
protocol = "http"
119119
net_type = "OUTER"
@@ -125,7 +125,7 @@ resource "tencentcloud_api_gateway_custom_domain" "foo" {
125125

126126
const testAccCustomDomainUpdate = `
127127
resource "tencentcloud_api_gateway_custom_domain" "foo" {
128-
service_id = "service-7lybgojo"
128+
service_id = "service-nxz6yync"
129129
sub_domain = "tic-test.dnsv1.com"
130130
protocol = "http"
131131
net_type = "OUTER"

‎tencentcloud/resource_tc_sqlserver_complete_expansion_test.go‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
)
88

99
// go test -i; go test -test.run TestAccTencentCloudSqlserverCompleteExpansionResource_basic -v
10+
// go test -v -run TestAccTencentCloudSqlserverCompleteExpansionResource_basic -timeout=0 ./tencentcloud/
1011
func TestAccTencentCloudSqlserverCompleteExpansionResource_basic(t *testing.T) {
1112
t.Parallel()
1213
resource.Test(t, resource.TestCase{
@@ -36,41 +37,41 @@ func TestAccTencentCloudSqlserverCompleteExpansionResource_basic(t *testing.T) {
3637

3738
const testAccNewSqlserverInstance string = testAccSqlserverBasicInstanceNetwork + `
3839
resource "tencentcloud_sqlserver_instance" "test" {
39-
name = "tf_sqlserver_instance"
40-
availability_zone = "ap-guangzhou-7"
41-
charge_type = "POSTPAID_BY_HOUR"
42-
vpc_id = "vpc-1yg5ua6l"
43-
subnet_id = "subnet-h7av55g8"
44-
security_groups = ["sg-mayqdlt1"]
45-
project_id = 0
46-
memory = 2
47-
storage = 10
48-
maintenance_week_set = [1,2,3]
49-
maintenance_start_time = "09:00"
50-
maintenance_time_span = 3
51-
tags = {
52-
"test" = "test"
40+
name = "tf_sqlserver_instance"
41+
availability_zone = "ap-guangzhou-7"
42+
charge_type = "POSTPAID_BY_HOUR"
43+
vpc_id = "vpc-1yg5ua6l"
44+
subnet_id = "subnet-h7av55g8"
45+
security_groups = ["sg-mayqdlt1"]
46+
project_id = 0
47+
memory = 2
48+
storage = 20
49+
maintenance_week_set = [1, 2, 3]
50+
maintenance_start_time = "09:00"
51+
maintenance_time_span = 3
52+
tags = {
53+
"test" = "test"
5354
}
5455
}
5556
`
5657

5758
const testAccUpdateNewSqlserverInstance string = testAccSqlserverBasicInstanceNetwork + `
5859
resource "tencentcloud_sqlserver_instance" "test" {
59-
name = "tf_sqlserver_instance"
60-
availability_zone = "ap-guangzhou-7"
61-
charge_type = "POSTPAID_BY_HOUR"
62-
vpc_id = "vpc-1yg5ua6l"
63-
subnet_id = "subnet-h7av55g8"
64-
security_groups = ["sg-mayqdlt1"]
65-
project_id = 0
66-
memory = 2
67-
storage = 20
68-
maintenance_week_set = [1,2,3]
69-
maintenance_start_time = "09:00"
70-
maintenance_time_span = 3
71-
wait_switch = 1
72-
tags = {
73-
"test" = "test"
60+
name = "tf_sqlserver_instance"
61+
availability_zone = "ap-guangzhou-7"
62+
charge_type = "POSTPAID_BY_HOUR"
63+
vpc_id = "vpc-1yg5ua6l"
64+
subnet_id = "subnet-h7av55g8"
65+
security_groups = ["sg-mayqdlt1"]
66+
project_id = 0
67+
memory = 2
68+
storage = 40
69+
maintenance_week_set = [1, 2, 3]
70+
maintenance_start_time = "09:00"
71+
maintenance_time_span = 3
72+
wait_switch = 1
73+
tags = {
74+
"test" = "test"
7475
}
7576
}
7677

‎tencentcloud/resource_tc_sqlserver_database_tde_test.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ func TestAccTencentCloudSqlserverDatabaseTDEResource_basic(t *testing.T) {
2525
ImportState: true,
2626
ImportStateVerify: true,
2727
},
28+
{
29+
Config: testAccSqlserverDatabaseTDEUpdate,
30+
Check: resource.ComposeTestCheckFunc(
31+
resource.TestCheckResourceAttrSet("tencentcloud_sqlserver_database_tde.database_tde", "id"),
32+
),
33+
},
2834
},
2935
})
3036
}
@@ -36,3 +42,11 @@ resource "tencentcloud_sqlserver_database_tde" "database_tde" {
3642
encryption = "enable"
3743
}
3844
`
45+
46+
const testAccSqlserverDatabaseTDEUpdate = `
47+
resource "tencentcloud_sqlserver_database_tde" "database_tde" {
48+
instance_id = "mssql-qelbzgwf"
49+
db_names = ["keep_tde_db", "keep_tde_db2"]
50+
encryption = "disable"
51+
}
52+
`

‎tencentcloud/resource_tc_sqlserver_publish_subscribe.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Example Usage
55
66
```hcl
77
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
8-
publish_instance_id = tencentcloud_sqlserver_instance.publish_instance.id
9-
subscribe_instance_id = tencentcloud_sqlserver_instance.subscribe_instance.id
10-
publish_subscribe_name = "example"
11-
delete_subscribe_db = false
12-
database_tuples {
13-
publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name
14-
}
8+
publish_instance_id = "mssql-qelbzgwf"
9+
subscribe_instance_id = "mssql-jdk2pwld"
10+
publish_subscribe_name = "example"
11+
delete_subscribe_db = false
12+
database_tuples {
13+
publish_database = "sqlserver_pubsub_db"
14+
}
1515
}
1616
```
1717

‎tencentcloud/resource_tc_sqlserver_publish_subscribe_test.go‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ func testAccUnsubscribePubDB(ctx context.Context, service *SqlserverService, ins
122122
}
123123
}
124124

125+
// go test -i; go test -test.run TestAccTencentCloudSqlserverPublishSubscribeResource -v
125126
func TestAccTencentCloudSqlserverPublishSubscribeResource(t *testing.T) {
126127
resource.Test(t, resource.TestCase{
127128
PreCheck: func() {
@@ -213,24 +214,25 @@ func testAccCheckSqlserverPublishSubscribeExists(n string) resource.TestCheckFun
213214
}
214215

215216
const testAccSqlserverPublishSubscribe_basic = CommonPubSubSQLServer + `
216-
217217
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
218-
publish_instance_id = local.pub_sqlserver_id
219-
subscribe_instance_id = local.sub_sqlserver_id
220-
publish_subscribe_name = "example"
221-
delete_subscribe_db = false
222-
database_tuples {
223-
publish_database = local.sqlserver_pubsub_db
224-
}
225-
}`
218+
publish_instance_id = "mssql-qelbzgwf"
219+
subscribe_instance_id = "mssql-jdk2pwld"
220+
publish_subscribe_name = "example"
221+
delete_subscribe_db = false
222+
database_tuples {
223+
publish_database = local.sqlserver_pubsub_db
224+
}
225+
}
226+
`
226227

227228
const testAccSqlserverPublishSubscribe_basic_update_name = CommonPubSubSQLServer + `
228229
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
229-
publish_instance_id = local.pub_sqlserver_id
230-
subscribe_instance_id = local.sub_sqlserver_id
231-
publish_subscribe_name = "example1"
232-
delete_subscribe_db = false
233-
database_tuples {
234-
publish_database = local.sqlserver_pubsub_db
235-
}
236-
}`
230+
publish_instance_id = "mssql-qelbzgwf"
231+
subscribe_instance_id = "mssql-jdk2pwld"
232+
publish_subscribe_name = "example1"
233+
delete_subscribe_db = false
234+
database_tuples {
235+
publish_database = local.sqlserver_pubsub_db
236+
}
237+
}
238+
`

‎tencentcloud/resource_tc_sqlserver_restore_instance_test.go‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ import (
55
"fmt"
66
"strings"
77
"testing"
8+
"time"
89

910
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1011
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1112
)
1213

1314
// go test -i; go test -test.run TestAccTencentCloudSqlserverRestoreInstanceResource_basic -v
1415
func TestAccTencentCloudSqlserverRestoreInstanceResource_basic(t *testing.T) {
16+
loc, _ := time.LoadLocation("Asia/Shanghai")
17+
startTime := time.Now().AddDate(0, 0, -3).In(loc).Format("2006-01-02 15:04:05")
18+
endTime := time.Now().In(loc).Format("2006-01-02 15:04:05")
1519
resource.Test(t, resource.TestCase{
1620
PreCheck: func() {
1721
testAccPreCheck(t)
@@ -20,7 +24,7 @@ func TestAccTencentCloudSqlserverRestoreInstanceResource_basic(t *testing.T) {
2024
Providers: testAccProviders,
2125
Steps: []resource.TestStep{
2226
{
23-
Config: testAccSqlserverRestoreInstance,
27+
Config: fmt.Sprintf(testAccSqlserverRestoreInstance, startTime, endTime),
2428
Check: resource.ComposeTestCheckFunc(
2529
resource.TestCheckResourceAttrSet("tencentcloud_sqlserver_restore_instance.restore_instance", "id"),
2630
),
@@ -68,9 +72,15 @@ func testAccCheckSqlserverRestoreDBDestroy(s *terraform.State) error {
6872
}
6973

7074
const testAccSqlserverRestoreInstance = `
71-
resource "tencentcloud_sqlserver_restore_instance" "restore_instance" {
75+
data "tencentcloud_sqlserver_backups" "example" {
7276
instance_id = "mssql-qelbzgwf"
73-
backup_id = 3482091273
77+
start_time = "%s"
78+
end_time = "%s"
79+
}
80+
81+
resource "tencentcloud_sqlserver_restore_instance" "restore_instance" {
82+
instance_id = data.tencentcloud_sqlserver_backups.example.instance_id
83+
backup_id = data.tencentcloud_sqlserver_backups.example.list.0.id
7484
rename_restore {
7585
old_name = "keep_pubsub_db2"
7686
new_name = "restore_keep_pubsub_db2"

‎website/docs/r/sqlserver_publish_subscribe.html.markdown‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ Provides a SQL Server PublishSubscribe resource belongs to SQL Server instance.
1515

1616
```hcl
1717
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
18-
publish_instance_id = tencentcloud_sqlserver_instance.publish_instance.id
19-
subscribe_instance_id = tencentcloud_sqlserver_instance.subscribe_instance.id
18+
publish_instance_id = "mssql-qelbzgwf"
19+
subscribe_instance_id = "mssql-jdk2pwld"
2020
publish_subscribe_name = "example"
2121
delete_subscribe_db = false
2222
database_tuples {
23-
publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name
23+
publish_database = "sqlserver_pubsub_db"
2424
}
2525
}
2626
```

0 commit comments

Comments
 (0)