Skip to content

Commit b628786

Browse files
SevenEarthSevenEarth
authored
Feat/sql (#2040)
* feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * feat/sql * add * add * add
1 parent 7d0a949 commit b628786

File tree

129 files changed

+1012
-316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1012
-316
lines changed

‎.changelog/2040.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_sqlserver_publish_subscribe: Update `database_tuples` field
3+
```

‎tencentcloud/basic_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,8 @@ const defaultPubSQLServerName = "keep-publish-instance"
393393
const defaultSubSQLServerName = "keep-subscribe-instance"
394394
const defaultSQLServerDB = "keep_sqlserver_db"
395395
const defaultSQLServerPubSubDB = "keep_pubsub_db"
396+
const defaultSQLServerPubDB = "keep_pub_db"
397+
const defaultSQLServerSubDB = "keep_sub_db"
396398
const defaultSQLServerAccount = "keep_sqlserver_account"
397399

398400
const CommonPresetSQLServer = `
@@ -444,6 +446,8 @@ locals {
444446
pub_sqlserver_id = data.tencentcloud_sqlserver_instances.pub_sqlserver.instance_list.0.id
445447
sub_sqlserver_id = data.tencentcloud_sqlserver_instances.sub_sqlserver.instance_list.0.id
446448
sqlserver_pubsub_db = "` + defaultSQLServerPubSubDB + `"
449+
sqlserver_pub_db = "` + defaultSQLServerPubDB + `"
450+
sqlserver_sub_db = "` + defaultSQLServerSubDB + `"
447451
}
448452
`
449453

‎tencentcloud/data_source_tc_sqlserver_account_db_attachments_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ func TestAccDataSourceTencentCloudSqlserverAccountDBAttachments_basic(t *testing
3232
const testAccSQLServerAttachDataDB = "test_db_attachment"
3333

3434
const testAccTencentCloudDataSqlserverAccountDBAttachmentsBasic = CommonPresetSQLServerAccount + `
35+
data "tencentcloud_sqlserver_account_db_attachments" "test"{
36+
instance_id = local.sqlserver_id
37+
account_name = tencentcloud_sqlserver_account_db_attachment.test.account_name
38+
}
39+
3540
resource "tencentcloud_sqlserver_db" "test" {
3641
instance_id = local.sqlserver_id
3742
name = "` + testAccSQLServerAttachDataDB + `"
@@ -45,8 +50,4 @@ resource "tencentcloud_sqlserver_account_db_attachment" "test" {
4550
db_name = tencentcloud_sqlserver_db.test.name
4651
privilege = "ReadWrite"
4752
}
48-
data "tencentcloud_sqlserver_account_db_attachments" "test"{
49-
instance_id = local.sqlserver_id
50-
account_name = tencentcloud_sqlserver_account_db_attachment.test.account_name
51-
}
5253
`

‎tencentcloud/data_source_tc_sqlserver_accounts.go‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@ Use this data source to query the list of SQL Server accounts.
33
44
Example Usage
55
6+
Pull instance account list
7+
68
```hcl
7-
data "tencentcloud_sqlserver_accounts" "name" {
8-
instance_id = "mssql-3cdq7kx5"
9-
name = "myaccount"
9+
data "tencentcloud_sqlserver_accounts" "example" {
10+
instance_id = "mssql-3cdq7kx5"
1011
}
12+
```
1113
12-
data "tencentcloud_sqlserver_accounts" "foo" {
13-
instance_id = "mssql-3cdq7kx5"
14+
Pull instance account list Filter by name
15+
16+
```hcl
17+
data "tencentcloud_sqlserver_accounts" "example" {
18+
instance_id = "mssql-3cdq7kx5"
19+
name = "myaccount"
1420
}
1521
```
1622
*/

‎tencentcloud/data_source_tc_sqlserver_accounts_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
var testDataSqlserverAccountsName = "data.tencentcloud_sqlserver_accounts.test"
1010

11+
// go test -i; go test -test.run TestAccDataSourceTencentCloudSqlserverAccounts -v
1112
func TestAccDataSourceTencentCloudSqlserverAccounts(t *testing.T) {
1213
t.Parallel()
1314
resource.Test(t, resource.TestCase{

‎tencentcloud/data_source_tc_sqlserver_backup_by_flow_id.go‎

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,65 @@ Use this data source to query detailed information of sqlserver datasource_backu
44
Example Usage
55
66
```hcl
7-
resource "tencentcloud_sqlserver_general_backup" "general_backup" {
8-
strategy = 0
9-
instance_id = "mssql-qelbzgwf"
10-
backup_name = "create_sqlserver_backup_name"
7+
data "tencentcloud_availability_zones_by_product" "zones" {
8+
product = "sqlserver"
119
}
1210
13-
data "tencentcloud_sqlserver_backup_by_flow_id" "backup_by_flow_id" {
14-
instance_id = tencentcloud_sqlserver_general_backup.general_backup.instance_id
15-
flow_id = tencentcloud_sqlserver_general_backup.general_backup.flow_id
11+
data "tencentcloud_sqlserver_backup_by_flow_id" "example" {
12+
instance_id = tencentcloud_sqlserver_general_backup.example.instance_id
13+
flow_id = tencentcloud_sqlserver_general_backup.example.flow_id
14+
}
15+
16+
resource "tencentcloud_vpc" "vpc" {
17+
name = "vpc-example"
18+
cidr_block = "10.0.0.0/16"
19+
}
20+
21+
resource "tencentcloud_subnet" "subnet" {
22+
availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.4.name
23+
name = "subnet-example"
24+
vpc_id = tencentcloud_vpc.vpc.id
25+
cidr_block = "10.0.0.0/16"
26+
is_multicast = false
27+
}
28+
29+
resource "tencentcloud_security_group" "security_group" {
30+
name = "sg-example"
31+
description = "desc."
32+
}
33+
34+
resource "tencentcloud_sqlserver_basic_instance" "example" {
35+
name = "tf-example"
36+
availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.4.name
37+
charge_type = "POSTPAID_BY_HOUR"
38+
vpc_id = tencentcloud_vpc.vpc.id
39+
subnet_id = tencentcloud_subnet.subnet.id
40+
project_id = 0
41+
memory = 4
42+
storage = 100
43+
cpu = 2
44+
machine_type = "CLOUD_PREMIUM"
45+
maintenance_week_set = [1, 2, 3]
46+
maintenance_start_time = "09:00"
47+
maintenance_time_span = 3
48+
security_groups = [tencentcloud_security_group.security_group.id]
49+
50+
tags = {
51+
"test" = "test"
52+
}
53+
}
54+
55+
resource "tencentcloud_sqlserver_db" "example" {
56+
instance_id = tencentcloud_sqlserver_basic_instance.example.id
57+
name = "tf_example_db"
58+
charset = "Chinese_PRC_BIN"
59+
remark = "test-remark"
60+
}
61+
62+
resource "tencentcloud_sqlserver_general_backup" "example" {
63+
instance_id = tencentcloud_sqlserver_db.example.id
64+
backup_name = "tf_example_backup"
65+
strategy = 0
1666
}
1767
```
1868
*/

‎tencentcloud/data_source_tc_sqlserver_backup_by_flow_id_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ func TestAccTencentCloudSqlserverBackupByFlowIdDataSource_basic(t *testing.T) {
1919
{
2020
Config: testAccSqlserverBackupByFlowIdDataSource,
2121
Check: resource.ComposeTestCheckFunc(
22-
testAccCheckTencentCloudDataSourceID("data.tencentcloud_sqlserver_backup_by_flow_id.backup_by_flow_id"),
22+
testAccCheckTencentCloudDataSourceID("data.tencentcloud_sqlserver_backup_by_flow_id.example"),
2323
),
2424
},
2525
},
2626
})
2727
}
2828

2929
const testAccSqlserverBackupByFlowIdDataSource = testAccSqlserverGeneralBackup + `
30-
data "tencentcloud_sqlserver_backup_by_flow_id" "backup_by_flow_id" {
31-
instance_id = tencentcloud_sqlserver_general_backup.general_backup.instance_id
32-
flow_id = tencentcloud_sqlserver_general_backup.general_backup.flow_id
30+
data "tencentcloud_sqlserver_backup_by_flow_id" "example" {
31+
instance_id = tencentcloud_sqlserver_general_backup.example.instance_id
32+
flow_id = tencentcloud_sqlserver_general_backup.example.flow_id
3333
}
3434
`

‎tencentcloud/data_source_tc_sqlserver_backup_commands.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ Use this data source to query detailed information of sqlserver datasource_backu
44
Example Usage
55
66
```hcl
7-
data "tencentcloud_sqlserver_backup_commands" "backup_command" {
7+
data "tencentcloud_sqlserver_backup_commands" "example" {
88
backup_file_type = "FULL"
9-
data_base_name = "keep-publish-instance"
10-
is_recovery = "NO"
11-
local_path = ""
9+
data_base_name = "keep-publish-instance"
10+
is_recovery = "NO"
1211
}
1312
```
1413
*/

‎tencentcloud/data_source_tc_sqlserver_backup_commands_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@ func TestAccTencentCloudSqlserverBackupCommands_basic(t *testing.T) {
1818
{
1919
Config: testAccSqlserverBackupCommands,
2020
Check: resource.ComposeTestCheckFunc(
21-
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_backup_commands.backup_command", "list.#"),
21+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_backup_commands.example", "list.#"),
2222
),
2323
},
2424
},
2525
})
2626
}
2727

2828
const testAccSqlserverBackupCommands = `
29-
data "tencentcloud_sqlserver_backup_commands" "backup_command" {
29+
data "tencentcloud_sqlserver_backup_commands" "example" {
3030
backup_file_type = "FULL"
31-
data_base_name = "keep-publish-instance"
32-
is_recovery = "NO"
33-
local_path = ""
31+
data_base_name = "keep-publish-instance"
32+
is_recovery = "NO"
3433
}
3534
`

‎tencentcloud/data_source_tc_sqlserver_backup_upload_size.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Use this data source to query detailed information of sqlserver datasource_backu
44
Example Usage
55
66
```hcl
7-
data "tencentcloud_sqlserver_backup_upload_size" "backup_upload_size" {
8-
instance_id = "mssql-4gmc5805"
7+
data "tencentcloud_sqlserver_backup_upload_size" "example" {
8+
instance_id = "mssql-4gmc5805"
99
backup_migration_id = "mssql-backup-migration-9tj0sxnz"
1010
}
1111
```

0 commit comments

Comments
 (0)