Skip to content

Commit 3bdbd91

Browse files
gailwanggailwang
authored
Merge pull request #524 from cyberHermanwang/master
add sqlserver publish subscribe data_source and resource files
2 parents eb1c968 + a26d07a commit 3bdbd91

13 files changed

+1169
-4
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
FEATURES:
44

5+
* **New Resource**: `tencentcloud_sqlserver_publish_subscribe`
56
* **New Resource**: `tencentcloud_vod_adaptive_dynamic_streaming_template`.
67
* **New Resource**: `tencentcloud_vod_procedure_template`.
78
* **New Resource**: `tencentcloud_vod_snapshot_by_time_offset_template`.
89
* **New Resource**: `tencentcloud_vod_image_sprite_template`.
910
* **New Resource**: `tencentcloud_vod_super_player_config`.
11+
* **New Data Source**: `tencentcloud_sqlserver_publish_subscribes`
1012
* **New Data Source**: `tencentcloud_vod_adaptive_dynamic_streaming_templates`.
1113
* **New Data Source**: `tencentcloud_vod_image_sprite_templates`.
1214
* **New Data Source**: `tencentcloud_vod_procedure_templates`.

‎examples/tencentcloud-sqlserver/main.tf

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ resource "tencentcloud_sqlserver_readonly_instance" "example" {
6060
force_upgrade = true
6161
}
6262

63+
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
64+
publish_instance_id = tencentcloud_sqlserver_instance.example.id
65+
subscribe_instance_id = tencentcloud_sqlserver_instance.example_other.id
66+
publish_subscribe_name = "example"
67+
database_tuples {
68+
publish_database = tencentcloud_sqlserver_db.example.name
69+
}
70+
}
71+
6372

6473
data "tencentcloud_sqlserver_instances" "id_example" {
6574
id = tencentcloud_sqlserver_instance.example.id
@@ -97,3 +106,9 @@ data "tencentcloud_sqlserver_readonly_groups" "example" {
97106
master_instance_id = tencentcloud_sqlserver_instance.example.id
98107
}
99108

109+
data "tencentcloud_sqlserver_publish_subscribes" "publish_subscribes" {
110+
instance_id = tencentcloud_sqlserver_publish_subscribe.example.publish_instance_id
111+
pub_or_sub_instance_id = tencentcloud_sqlserver_publish_subscribe.example.subscribe_instance_id
112+
publish_subscribe_name = tencentcloud_sqlserver_publish_subscribe.example.publish_subscribe_name
113+
}
114+

‎tencentcloud/data_source_tc_sqlserver_publish_subscribes.go

Lines changed: 229 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,229 @@
1+
/*
2+
Use this data source to query Publish Subscribe resources for the specific SQL Server instance.
3+
4+
Example Usage
5+
6+
```hcl
7+
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+
}
15+
}
16+
```
17+
*/
18+
package tencentcloud
19+
20+
import (
21+
"context"
22+
"log"
23+
24+
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
25+
"github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper"
26+
)
27+
28+
func dataSourceTencentSqlserverPublishSubscribes() *schema.Resource {
29+
return &schema.Resource{
30+
Read: dataSourceTencentSqlserverPublishSubscribesRead,
31+
Schema: map[string]*schema.Schema{
32+
"result_output_file": {
33+
Type: schema.TypeString,
34+
Optional: true,
35+
Description: "Used to store results.",
36+
},
37+
"instance_id": {
38+
Type: schema.TypeString,
39+
Required: true,
40+
Description: "ID of the SQL Server instance.",
41+
},
42+
"pub_or_sub_instance_id": {
43+
Type: schema.TypeString,
44+
Optional: true,
45+
Description: "The subscribe/publish instance ID is related to whether the `instance_id` is a publish instance or a subscribe instance. when `instance_id` is a publish instance, this field is filtered according to the subscribe instance ID; when `instance_id` is a subscribe instance, this field is filtering according to the publish instance ID.",
46+
},
47+
"pub_or_sub_instance_ip": {
48+
Type: schema.TypeString,
49+
Optional: true,
50+
Description: "The intranet IP of the subscribe/publish instance is related to whether the `instance_id` is a publish instance or a subscribe instance. when `instance_id` is a publish instance, this field is filtered according to the intranet IP of the subscribe instance; when `instance_id` is a subscribe instance, this field is based on the publish instance intranet IP filter.",
51+
},
52+
"publish_subscribe_id": {
53+
Type: schema.TypeInt,
54+
Optional: true,
55+
Description: "The id of the Publish and Subscribe in the SQLServer instance.",
56+
},
57+
"publish_subscribe_name": {
58+
Type: schema.TypeString,
59+
Optional: true,
60+
Description: "The name of the Publish and Subscribe in the SQLServer instance.",
61+
},
62+
"publish_database": {
63+
Type: schema.TypeString,
64+
Optional: true,
65+
Description: "Publish the database.",
66+
},
67+
"subscribe_database": {
68+
Type: schema.TypeString,
69+
Optional: true,
70+
Description: "Subscribe to the database.",
71+
},
72+
"publish_subscribe_list": {
73+
Type: schema.TypeList,
74+
Computed: true,
75+
Description: "Publish and subscribe list. Each element contains the following attributes.",
76+
Elem: &schema.Resource{
77+
Schema: map[string]*schema.Schema{
78+
"publish_subscribe_id": {
79+
Type: schema.TypeInt,
80+
Computed: true,
81+
Description: "The id of the Publish and Subscribe in the SQLServer instance.",
82+
},
83+
"publish_subscribe_name": {
84+
Type: schema.TypeString,
85+
Computed: true,
86+
Description: "The name of the Publish and Subscribe in the SQLServer instance.",
87+
},
88+
"publish_instance_id": {
89+
Type: schema.TypeString,
90+
Computed: true,
91+
Description: "Publish the instance ID in the SQLServer instance.",
92+
},
93+
"publish_instance_name": {
94+
Type: schema.TypeString,
95+
Computed: true,
96+
Description: "Publish the instance name in the SQLServer instance.",
97+
},
98+
"publish_instance_ip": {
99+
Type: schema.TypeString,
100+
Computed: true,
101+
Description: "Publish the instance IP in the SQLServer instance.",
102+
},
103+
"subscribe_instance_id": {
104+
Type: schema.TypeString,
105+
Computed: true,
106+
Description: "Subscribe the instance ID in the SQLServer instance.",
107+
},
108+
"subscribe_instance_name": {
109+
Type: schema.TypeString,
110+
Computed: true,
111+
Description: "Subscribe the instance name in the SQLServer instance.",
112+
},
113+
"subscribe_instance_ip": {
114+
Type: schema.TypeString,
115+
Computed: true,
116+
Description: "Subscribe the instance IP in the SQLServer instance.",
117+
},
118+
"database_tuples": {
119+
Type: schema.TypeSet,
120+
Computed: true,
121+
Description: "Database Publish and Publish relationship list.",
122+
Elem: &schema.Resource{
123+
Schema: map[string]*schema.Schema{
124+
"publish_database": {
125+
Type: schema.TypeString,
126+
Computed: true,
127+
Description: "Publish the database.",
128+
},
129+
"subscribe_database": {
130+
Type: schema.TypeString,
131+
Computed: true,
132+
Description: "Subscribe to the database.",
133+
},
134+
"last_sync_time": {
135+
Type: schema.TypeString,
136+
Computed: true,
137+
Description: "Last sync time.",
138+
},
139+
"status": {
140+
Type: schema.TypeString,
141+
Computed: true,
142+
Description: "Publish and subscribe status between databases `running`, `success`, `fail`, `unknow`.",
143+
},
144+
},
145+
},
146+
},
147+
},
148+
},
149+
},
150+
},
151+
}
152+
}
153+
154+
func dataSourceTencentSqlserverPublishSubscribesRead(d *schema.ResourceData, meta interface{}) error {
155+
defer logElapsed("data_source.tencentcloud_sqlserver_publish_subscribes.read")()
156+
157+
logId := getLogId(contextNil)
158+
ctx := context.WithValue(context.TODO(), logIdKey, logId)
159+
sqlserverService := SqlserverService{client: meta.(*TencentCloudClient).apiV3Conn}
160+
paramMap := make(map[string]interface{})
161+
paramMap["instanceId"] = d.Get("instance_id").(string)
162+
if v, ok := d.GetOk("pub_or_sub_instance_id"); ok {
163+
paramMap["pubOrSubInstanceId"] = v.(string)
164+
}
165+
if v, ok := d.GetOk("pub_or_sub_instance_ip"); ok {
166+
paramMap["pubOrSubInstanceIp"] = v.(string)
167+
}
168+
if v, ok := d.GetOk("publish_subscribe_name"); ok {
169+
paramMap["publishSubscribeName"] = v.(string)
170+
}
171+
if v, ok := d.GetOk("publish_subscribe_id"); ok {
172+
id := v.(int)
173+
paramMap["publishSubscribeId"] = *helper.IntUint64(id)
174+
} else {
175+
paramMap["publishSubscribeId"] = *helper.IntUint64(0)
176+
}
177+
if v, ok := d.GetOk("publish_database"); ok {
178+
paramMap["publishDBName"] = v.(string)
179+
paramMap["subscribeDBName"] = v.(string)
180+
}
181+
182+
publishSubscribes, err := sqlserverService.DescribeSqlserverPublishSubscribes(ctx, paramMap)
183+
if err != nil {
184+
return err
185+
}
186+
instanceList := make([]map[string]interface{}, 0, len(publishSubscribes))
187+
ids := make([]string, 0, len(publishSubscribes))
188+
189+
for _, publishSubscribe := range publishSubscribes {
190+
var databaseTupleStatus []map[string]interface{}
191+
for _, inst := range publishSubscribe.DatabaseTupleSet {
192+
databaseTuple := map[string]interface{}{
193+
"publish_database": inst.PublishDatabase,
194+
"subscribe_database": inst.SubscribeDatabase,
195+
"last_sync_time": inst.LastSyncTime,
196+
"status": inst.Status,
197+
}
198+
databaseTupleStatus = append(databaseTupleStatus, databaseTuple)
199+
}
200+
instance := map[string]interface{}{
201+
"publish_subscribe_id": publishSubscribe.Id,
202+
"publish_subscribe_name": publishSubscribe.Name,
203+
"publish_instance_id": publishSubscribe.PublishInstanceId,
204+
"publish_instance_ip": publishSubscribe.PublishInstanceIp,
205+
"publish_instance_name": publishSubscribe.PublishInstanceName,
206+
"subscribe_instance_id": publishSubscribe.SubscribeInstanceId,
207+
"subscribe_instance_ip": publishSubscribe.SubscribeInstanceIp,
208+
"subscribe_instance_name": publishSubscribe.SubscribeInstanceName,
209+
"database_tuples": databaseTupleStatus,
210+
}
211+
resourceId := *publishSubscribe.PublishInstanceId + FILED_SP + *publishSubscribe.SubscribeInstanceId
212+
instanceList = append(instanceList, instance)
213+
ids = append(ids, resourceId)
214+
}
215+
216+
d.SetId(helper.DataResourceIdsHash(ids))
217+
if err = d.Set("publish_subscribe_list", instanceList); err != nil {
218+
log.Printf("[CRITAL]%s provider set sql server publish and subscribe list fail, reason:%s ", logId, err.Error())
219+
return err
220+
}
221+
222+
output, ok := d.GetOk("result_output_file")
223+
if ok && output.(string) != "" {
224+
if err := writeToFile(output.(string), instanceList); err != nil {
225+
return err
226+
}
227+
}
228+
return nil
229+
}

‎tencentcloud/data_source_tc_sqlserver_publish_subscribes_test.go

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
package tencentcloud
2+
3+
import (
4+
"testing"
5+
6+
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
7+
)
8+
9+
func TestAccTencentCloudSqlserverPublishSubscribeDataSource(t *testing.T) {
10+
resource.Test(t, resource.TestCase{
11+
PreCheck: func() { testAccPreCheck(t) },
12+
Providers: testAccProviders,
13+
CheckDestroy: testAccCheckSqlserverPublishSubscribeDestroy,
14+
Steps: []resource.TestStep{
15+
{
16+
Config: testAccTencentCloudSqlServerPublishSubscribeDataSourceConfig,
17+
Check: resource.ComposeTestCheckFunc(
18+
testAccCheckSqlserverPublishSubscribeExists("tencentcloud_sqlserver_publish_subscribe.example"),
19+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.publish_instance_id"),
20+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.subscribe_instance_id"),
21+
resource.TestCheckResourceAttr("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.publish_subscribe_name", "example"),
22+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.publish_instance_ip"),
23+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.subscribe_instance_ip"),
24+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.publish_instance_name"),
25+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.subscribe_instance_name"),
26+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.publish_subscribe_id"),
27+
resource.TestCheckResourceAttr("data.tencentcloud_sqlserver_publish_subscribes.publish_subscribes", "publish_subscribe_list.0.database_tuples.#", "1"),
28+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.publish_foos", "publish_subscribe_list.0.publish_instance_id"),
29+
resource.TestCheckResourceAttrSet("data.tencentcloud_sqlserver_publish_subscribes.subscribe_foos", "publish_subscribe_list.0.subscribe_instance_id"),
30+
),
31+
},
32+
},
33+
})
34+
}
35+
36+
const testAccTencentCloudSqlServerPublishSubscribeDataSourceConfig = testAccSqlserverInstanceBasic + `
37+
resource "tencentcloud_security_group" "foo" {
38+
name = "test-sg-tf"
39+
}
40+
41+
resource "tencentcloud_sqlserver_instance" "publish_instance" {
42+
name = "tf_sqlserver_publish_instance"
43+
availability_zone = var.availability_zone
44+
charge_type = "POSTPAID_BY_HOUR"
45+
vpc_id = "` + defaultVpcId + `"
46+
subnet_id = "` + defaultSubnetId + `"
47+
project_id = 0
48+
memory = 2
49+
storage = 10
50+
maintenance_week_set = [1,2,3]
51+
maintenance_start_time= "09:00"
52+
maintenance_time_span = 3
53+
security_groups = [tencentcloud_security_group.foo.name]
54+
}
55+
56+
resource "tencentcloud_sqlserver_instance" "subscribe_instance" {
57+
name = "tf_sqlserver_subscribe_instance"
58+
availability_zone = var.availability_zone
59+
charge_type = "POSTPAID_BY_HOUR"
60+
vpc_id = "` + defaultVpcId + `"
61+
subnet_id = "` + defaultSubnetId + `"
62+
project_id = 0
63+
memory = 2
64+
storage = 10
65+
maintenance_week_set = [1,2,3]
66+
maintenance_start_time = "09:00"
67+
maintenance_time_span = 3
68+
security_groups = [tencentcloud_security_group.foo.name]
69+
}
70+
71+
resource "tencentcloud_sqlserver_db" "test_publish_subscribe" {
72+
instance_id = tencentcloud_sqlserver_instance.publish_instance.id
73+
name = "test111"
74+
charset = "Chinese_PRC_BIN"
75+
remark = "testACC-remark"
76+
}
77+
78+
resource "tencentcloud_sqlserver_publish_subscribe" "example" {
79+
publish_instance_id = tencentcloud_sqlserver_instance.publish_instance.id
80+
subscribe_instance_id = tencentcloud_sqlserver_instance.subscribe_instance.id
81+
publish_subscribe_name = "example"
82+
delete_subscribe_db = false
83+
database_tuples {
84+
publish_database = tencentcloud_sqlserver_db.test_publish_subscribe.name
85+
}
86+
}
87+
88+
data "tencentcloud_sqlserver_publish_subscribes" "publish_subscribes" {
89+
instance_id = tencentcloud_sqlserver_publish_subscribe.example.publish_instance_id
90+
pub_or_sub_instance_id = tencentcloud_sqlserver_publish_subscribe.example.subscribe_instance_id
91+
publish_subscribe_name = tencentcloud_sqlserver_publish_subscribe.example.publish_subscribe_name
92+
}
93+
94+
data "tencentcloud_sqlserver_publish_subscribes" "publish_foos" {
95+
instance_id = tencentcloud_sqlserver_publish_subscribe.example.publish_instance_id
96+
}
97+
98+
data "tencentcloud_sqlserver_publish_subscribes" "subscribe_foos" {
99+
instance_id = tencentcloud_sqlserver_publish_subscribe.example.subscribe_instance_id
100+
}
101+
`

‎tencentcloud/extension_sqlserver.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,8 @@ const (
7171
BASIC_NETWORK = 0
7272
VPC_NEWORK = 1
7373
)
74+
75+
const (
76+
INTERNALERROR_DBERROR = "InternalError.DBError"
77+
INSTANCE_STATUS_INVALID = "ResourceUnavailable.InstanceStatusInvalid"
78+
)

0 commit comments

Comments
 (0)