Skip to content

Commit 63e8b7f

Browse files
SevenEarthSevenEarth
authored
add (#3372)
1 parent 2713ed3 commit 63e8b7f

34 files changed

+384
-304
lines changed

‎tencentcloud/services/privatedns/data_source_tc_private_dns_end_points.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Code generated by iacg; DO NOT EDIT.
21
package privatedns
32

43
import (
@@ -109,10 +108,11 @@ func dataSourceTencentCloudPrivateDnsEndPointsRead(d *schema.ResourceData, meta
109108
defer tccommon.LogElapsed("data_source.tencentcloud_private_dns_end_points.read")()
110109
defer tccommon.InconsistentCheck(d, meta)()
111110

112-
logId := tccommon.GetLogId(nil)
113-
ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
114-
115-
service := PrivatednsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
111+
var (
112+
logId = tccommon.GetLogId(nil)
113+
ctx = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
114+
service = PrivatednsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
115+
)
116116

117117
paramMap := make(map[string]interface{})
118118
if v, ok := d.GetOk("filters"); ok {
@@ -124,27 +124,32 @@ func dataSourceTencentCloudPrivateDnsEndPointsRead(d *schema.ResourceData, meta
124124
if v, ok := filtersMap["name"]; ok {
125125
filter.Name = helper.String(v.(string))
126126
}
127+
127128
if v, ok := filtersMap["values"]; ok {
128129
valuesSet := v.(*schema.Set).List()
129130
for i := range valuesSet {
130131
values := valuesSet[i].(string)
131132
filter.Values = append(filter.Values, helper.String(values))
132133
}
133134
}
135+
134136
tmpSet = append(tmpSet, &filter)
135137
}
138+
136139
paramMap["Filters"] = tmpSet
137140
}
138141

139142
var respData []*privatednsv20201028.EndPointInfo
140143
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
141144
result, e := service.DescribePrivateDnsEndPointsByFilter(ctx, paramMap)
142145
if e != nil {
143-
return tccommon.RetryError(e)
146+
return tccommon.RetryError(e, PRIVATEDNS_CUSTOM_RETRY_SDK_ERROR...)
144147
}
148+
145149
respData = result
146150
return nil
147151
})
152+
148153
if err != nil {
149154
return err
150155
}
@@ -154,9 +159,9 @@ func dataSourceTencentCloudPrivateDnsEndPointsRead(d *schema.ResourceData, meta
154159
if respData != nil {
155160
for _, endPointSet := range respData {
156161
endPointSetMap := map[string]interface{}{}
157-
158162
if endPointSet.EndPointId != nil {
159163
endPointSetMap["end_point_id"] = endPointSet.EndPointId
164+
ids = append(ids, *endPointSet.EndPointId)
160165
}
161166

162167
if endPointSet.EndPointName != nil {
@@ -179,7 +184,6 @@ func dataSourceTencentCloudPrivateDnsEndPointsRead(d *schema.ResourceData, meta
179184
if endPointSet.Tags != nil {
180185
for _, tags := range endPointSet.Tags {
181186
tagsMap := map[string]interface{}{}
182-
183187
if tags.TagKey != nil {
184188
tagsMap["tag_key"] = tags.TagKey
185189
}
@@ -193,14 +197,14 @@ func dataSourceTencentCloudPrivateDnsEndPointsRead(d *schema.ResourceData, meta
193197

194198
endPointSetMap["tags"] = tagsList
195199
}
200+
196201
endPointSetList = append(endPointSetList, endPointSetMap)
197202
}
198203

199204
_ = d.Set("end_point_set", endPointSetList)
200205
}
201206

202207
d.SetId(helper.DataResourceIdsHash(ids))
203-
204208
output, ok := d.GetOk("result_output_file")
205209
if ok && output.(string) != "" {
206210
if e := tccommon.WriteToFile(output.(string), endPointSetList); e != nil {

‎tencentcloud/services/privatedns/data_source_tc_private_dns_end_points.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Use this data source to query detailed information of private dns dns end points
1+
Use this data source to query detailed information of Private Dns end points
22

33
Example Usage
44

‎tencentcloud/services/privatedns/data_source_tc_private_dns_forward_rules.go

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Code generated by iacg; DO NOT EDIT.
21
package privatedns
32

43
import (
@@ -153,10 +152,11 @@ func dataSourceTencentCloudPrivateDnsForwardRulesRead(d *schema.ResourceData, me
153152
defer tccommon.LogElapsed("data_source.tencentcloud_private_dns_forward_rules.read")()
154153
defer tccommon.InconsistentCheck(d, meta)()
155154

156-
logId := tccommon.GetLogId(nil)
157-
ctx := tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
158-
159-
service := PrivatednsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
155+
var (
156+
logId = tccommon.GetLogId(nil)
157+
ctx = tccommon.NewResourceLifeCycleHandleFuncContext(context.Background(), logId, d, meta)
158+
service = PrivatednsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
159+
)
160160

161161
paramMap := make(map[string]interface{})
162162
if v, ok := d.GetOk("filters"); ok {
@@ -168,27 +168,32 @@ func dataSourceTencentCloudPrivateDnsForwardRulesRead(d *schema.ResourceData, me
168168
if v, ok := filtersMap["name"]; ok {
169169
filter.Name = helper.String(v.(string))
170170
}
171+
171172
if v, ok := filtersMap["values"]; ok {
172173
valuesSet := v.(*schema.Set).List()
173174
for i := range valuesSet {
174175
values := valuesSet[i].(string)
175176
filter.Values = append(filter.Values, helper.String(values))
176177
}
177178
}
179+
178180
tmpSet = append(tmpSet, &filter)
179181
}
182+
180183
paramMap["Filters"] = tmpSet
181184
}
182185

183186
var respData []*privatednsv20201028.ForwardRule
184187
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
185188
result, e := service.DescribePrivateDnsForwardRulesByFilter(ctx, paramMap)
186189
if e != nil {
187-
return tccommon.RetryError(e)
190+
return tccommon.RetryError(e, PRIVATEDNS_CUSTOM_RETRY_SDK_ERROR...)
188191
}
192+
189193
respData = result
190194
return nil
191195
})
196+
192197
if err != nil {
193198
return err
194199
}
@@ -198,8 +203,6 @@ func dataSourceTencentCloudPrivateDnsForwardRulesRead(d *schema.ResourceData, me
198203
if respData != nil {
199204
for _, forwardRuleSet := range respData {
200205
forwardRuleSetMap := map[string]interface{}{}
201-
202-
var ruleId string
203206
if forwardRuleSet.Domain != nil {
204207
forwardRuleSetMap["domain"] = forwardRuleSet.Domain
205208
}
@@ -210,6 +213,7 @@ func dataSourceTencentCloudPrivateDnsForwardRulesRead(d *schema.ResourceData, me
210213

211214
if forwardRuleSet.RuleId != nil {
212215
forwardRuleSetMap["rule_id"] = forwardRuleSet.RuleId
216+
ids = append(ids, *forwardRuleSet.RuleId)
213217
}
214218

215219
if forwardRuleSet.RuleType != nil {
@@ -254,6 +258,7 @@ func dataSourceTencentCloudPrivateDnsForwardRulesRead(d *schema.ResourceData, me
254258

255259
forwardRuleSetMap["vpc_set"] = vpcSetList
256260
}
261+
257262
if forwardRuleSet.ZoneId != nil {
258263
forwardRuleSetMap["zone_id"] = forwardRuleSet.ZoneId
259264
}
@@ -262,7 +267,6 @@ func dataSourceTencentCloudPrivateDnsForwardRulesRead(d *schema.ResourceData, me
262267
if forwardRuleSet.Tags != nil {
263268
for _, tags := range forwardRuleSet.Tags {
264269
tagsMap := map[string]interface{}{}
265-
266270
if tags.TagKey != nil {
267271
tagsMap["tag_key"] = tags.TagKey
268272
}
@@ -276,15 +280,14 @@ func dataSourceTencentCloudPrivateDnsForwardRulesRead(d *schema.ResourceData, me
276280

277281
forwardRuleSetMap["tags"] = tagsList
278282
}
279-
ids = append(ids, ruleId)
283+
280284
forwardRuleSetList = append(forwardRuleSetList, forwardRuleSetMap)
281285
}
282286

283287
_ = d.Set("forward_rule_set", forwardRuleSetList)
284288
}
285289

286290
d.SetId(helper.DataResourceIdsHash(ids))
287-
288291
output, ok := d.GetOk("result_output_file")
289292
if ok && output.(string) != "" {
290293
if e := tccommon.WriteToFile(output.(string), forwardRuleSetList); e != nil {

‎tencentcloud/services/privatedns/data_source_tc_private_dns_forward_rules.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Use this data source to query detailed information of private dns forward rules
1+
Use this data source to query detailed information of Private Dns forward rules
22

33
Example Usage
44

@@ -14,12 +14,7 @@ Query all private dns forward rules by filters
1414
data "tencentcloud_private_dns_forward_rules" "example" {
1515
filters {
1616
name = "RuleId"
17-
values = ["eid-e9d5880672"]
18-
}
19-
20-
filters {
21-
name = "RuleName"
22-
values = ["tf-example"]
17+
values = ["fid-2ece6ca305"]
2318
}
2419
2520
filters {

‎tencentcloud/services/privatedns/data_source_tc_private_dns_private_zone_list.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package privatedns
33
import (
44
"context"
55

6-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
76
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
87
privatedns "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns/v20201028"
98

@@ -243,16 +242,7 @@ func dataSourceTencentCloudPrivateDnsPrivateZoneListRead(d *schema.ResourceData,
243242
paramMap["Filters"] = tmpSet
244243
}
245244

246-
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
247-
result, e := service.DescribePrivatednsPrivateZoneListByFilter(ctx, paramMap)
248-
if e != nil {
249-
return tccommon.RetryError(e)
250-
}
251-
252-
privateZoneSet = result
253-
return nil
254-
})
255-
245+
privateZoneSet, err := service.DescribePrivatednsPrivateZoneListByFilter(ctx, paramMap)
256246
if err != nil {
257247
return err
258248
}

‎tencentcloud/services/privatedns/data_source_tc_private_dns_private_zone_list.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
Use this data source to query detailed information of privatedns private_zone_list
1+
Use this data source to query detailed information of Private Dns private zone list
22

33
Example Usage
44

5-
Get All PrivateZones:
5+
Query All private zones:
66

77
```hcl
88
data "tencentcloud_private_dns_private_zone_list" "example" {}
99
```
1010

11-
Get PrivateZone By ZoneId:
11+
Query private zones by ZoneId:
1212

1313
```hcl
1414
data "tencentcloud_private_dns_private_zone_list" "example" {
@@ -19,7 +19,7 @@ data "tencentcloud_private_dns_private_zone_list" "example" {
1919
}
2020
```
2121

22-
Get PrivateZone By Domain:
22+
Query private zones by Domain:
2323

2424
```hcl
2525
data "tencentcloud_private_dns_private_zone_list" "example" {
@@ -30,7 +30,7 @@ data "tencentcloud_private_dns_private_zone_list" "example" {
3030
}
3131
```
3232

33-
Get PrivateZone By Vpc:
33+
Query private zones by Vpc:
3434

3535
```hcl
3636
data "tencentcloud_private_dns_private_zone_list" "example" {

‎tencentcloud/services/privatedns/data_source_tc_private_dns_records.go

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55

66
tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"
77

8-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
98
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
109
privatedns "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns/v20201028"
1110

@@ -133,54 +132,43 @@ func dataSourceTencentCloudPrivateDnsRecordsRead(d *schema.ResourceData, meta in
133132
defer tccommon.LogElapsed("data_source.tencentcloud_private_dns_records.read")()
134133
defer tccommon.InconsistentCheck(d, meta)()
135134

136-
logId := tccommon.GetLogId(tccommon.ContextNil)
137-
138-
ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
135+
var (
136+
logId = tccommon.GetLogId(tccommon.ContextNil)
137+
ctx = context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
138+
service = PrivateDnsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
139+
)
139140

140141
zoneId := d.Get("zone_id").(string)
141142
filterList := make([]*privatedns.Filter, 0)
142-
143143
if v, ok := d.GetOk("filters"); ok {
144144
filters := v.([]interface{})
145-
146145
for _, item := range filters {
147146
filter := privatedns.Filter{}
148147
filterMap := item.(map[string]interface{})
149-
150148
if v, ok := filterMap["name"]; ok {
151149
filter.Name = helper.String(v.(string))
152150
}
151+
153152
if v, ok := filterMap["values"]; ok {
154153
valuesSet := v.(*schema.Set).List()
155154
filter.Values = helper.InterfacesStringsPoint(valuesSet)
156155
}
156+
157157
filterList = append(filterList, &filter)
158158
}
159159
}
160160

161-
service := PrivateDnsService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
162-
163161
var recordSet []*privatedns.PrivateZoneRecord
164-
165-
err := resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
166-
result, e := service.DescribePrivateDnsRecordByFilter(ctx, zoneId, filterList)
167-
if e != nil {
168-
return tccommon.RetryError(e)
169-
}
170-
recordSet = result
171-
return nil
172-
})
162+
recordSet, err := service.DescribePrivateDnsRecordByFilter(ctx, zoneId, filterList)
173163
if err != nil {
174164
return err
175165
}
176166

177167
ids := make([]string, 0, len(recordSet))
178168
tmpList := make([]map[string]interface{}, 0, len(recordSet))
179-
180169
if recordSet != nil {
181170
for _, privateZoneRecord := range recordSet {
182171
privateZoneRecordMap := map[string]interface{}{}
183-
184172
if privateZoneRecord.RecordId != nil {
185173
privateZoneRecordMap["record_id"] = privateZoneRecord.RecordId
186174
}
@@ -247,5 +235,6 @@ func dataSourceTencentCloudPrivateDnsRecordsRead(d *schema.ResourceData, meta in
247235
return e
248236
}
249237
}
238+
250239
return nil
251240
}

‎tencentcloud/services/privatedns/data_source_tc_private_dns_records.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
Use this data source to query detailed information of private dns records
1+
Use this data source to query detailed information of Private Dns records
22

33
Example Usage
44

55
```hcl
6-
data "tencentcloud_private_dns_records" "private_dns_record" {
7-
zone_id = "zone-xxxxxx"
6+
data "tencentcloud_private_dns_records" "example" {
7+
zone_id = "zone-kumt5wos"
8+
}
9+
```
10+
11+
Or
12+
13+
```hcl
14+
data "tencentcloud_private_dns_records" "example" {
15+
zone_id = "zone-kumt5wos"
816
filters {
9-
name = "Value"
10-
values = ["8.8.8.8"]
17+
name = "RecordType"
18+
values = ["A"]
1119
}
1220
}
13-
```
21+
```

0 commit comments

Comments
 (0)