Skip to content

Commit ce15f8b

Browse files
SevenEarthSevenEarth
authored
fix(teo): [127780387] tencentcloud_teo_origin_acl update doc (#3542)
* add * add
1 parent aa1cd60 commit ce15f8b

File tree

3 files changed

+123
-10
lines changed

3 files changed

+123
-10
lines changed

‎.changelog/3542.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
datasource/tencentcloud_teo_origin_acl: update doc.
3+
```

‎tencentcloud/services/teo/data_source_tc_teo_origin_acl.go‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,29 @@ func DataSourceTencentCloudTeoOriginAcl() *schema.Resource {
5959
Type: schema.TypeSet,
6060
Computed: true,
6161
Description: "IPv4 subnet.",
62+
Deprecated: "Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead.",
6263
Elem: &schema.Schema{
6364
Type: schema.TypeString,
6465
},
6566
},
6667
"i_pv6": {
68+
Type: schema.TypeSet,
69+
Computed: true,
70+
Description: "IPv6 subnet.",
71+
Deprecated: "Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead.",
72+
Elem: &schema.Schema{
73+
Type: schema.TypeString,
74+
},
75+
},
76+
"ipv4": {
77+
Type: schema.TypeSet,
78+
Computed: true,
79+
Description: "IPv4 subnet.",
80+
Elem: &schema.Schema{
81+
Type: schema.TypeString,
82+
},
83+
},
84+
"ipv6": {
6785
Type: schema.TypeSet,
6886
Computed: true,
6987
Description: "IPv6 subnet.",
@@ -118,11 +136,29 @@ func DataSourceTencentCloudTeoOriginAcl() *schema.Resource {
118136
Type: schema.TypeSet,
119137
Computed: true,
120138
Description: "IPv4 subnet.",
139+
Deprecated: "Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead.",
121140
Elem: &schema.Schema{
122141
Type: schema.TypeString,
123142
},
124143
},
125144
"i_pv6": {
145+
Type: schema.TypeSet,
146+
Computed: true,
147+
Description: "IPv6 subnet.",
148+
Deprecated: "Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead.",
149+
Elem: &schema.Schema{
150+
Type: schema.TypeString,
151+
},
152+
},
153+
"ipv4": {
154+
Type: schema.TypeSet,
155+
Computed: true,
156+
Description: "IPv4 subnet.",
157+
Elem: &schema.Schema{
158+
Type: schema.TypeString,
159+
},
160+
},
161+
"ipv6": {
126162
Type: schema.TypeSet,
127163
Computed: true,
128164
Description: "IPv6 subnet.",
@@ -143,11 +179,29 @@ func DataSourceTencentCloudTeoOriginAcl() *schema.Resource {
143179
Type: schema.TypeSet,
144180
Computed: true,
145181
Description: "IPv4 subnet.",
182+
Deprecated: "Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead.",
146183
Elem: &schema.Schema{
147184
Type: schema.TypeString,
148185
},
149186
},
150187
"i_pv6": {
188+
Type: schema.TypeSet,
189+
Computed: true,
190+
Description: "IPv6 subnet.",
191+
Deprecated: "Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead.",
192+
Elem: &schema.Schema{
193+
Type: schema.TypeString,
194+
},
195+
},
196+
"ipv4": {
197+
Type: schema.TypeSet,
198+
Computed: true,
199+
Description: "IPv4 subnet.",
200+
Elem: &schema.Schema{
201+
Type: schema.TypeString,
202+
},
203+
},
204+
"ipv6": {
151205
Type: schema.TypeSet,
152206
Computed: true,
153207
Description: "IPv6 subnet.",
@@ -168,11 +222,29 @@ func DataSourceTencentCloudTeoOriginAcl() *schema.Resource {
168222
Type: schema.TypeSet,
169223
Computed: true,
170224
Description: "IPv4 subnet.",
225+
Deprecated: "Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead.",
171226
Elem: &schema.Schema{
172227
Type: schema.TypeString,
173228
},
174229
},
175230
"i_pv6": {
231+
Type: schema.TypeSet,
232+
Computed: true,
233+
Description: "IPv6 subnet.",
234+
Deprecated: "Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead.",
235+
Elem: &schema.Schema{
236+
Type: schema.TypeString,
237+
},
238+
},
239+
"ipv4": {
240+
Type: schema.TypeSet,
241+
Computed: true,
242+
Description: "IPv4 subnet.",
243+
Elem: &schema.Schema{
244+
Type: schema.TypeString,
245+
},
246+
},
247+
"ipv6": {
176248
Type: schema.TypeSet,
177249
Computed: true,
178250
Description: "IPv6 subnet.",
@@ -193,11 +265,29 @@ func DataSourceTencentCloudTeoOriginAcl() *schema.Resource {
193265
Type: schema.TypeSet,
194266
Computed: true,
195267
Description: "IPv4 subnet.",
268+
Deprecated: "Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead.",
196269
Elem: &schema.Schema{
197270
Type: schema.TypeString,
198271
},
199272
},
200273
"i_pv6": {
274+
Type: schema.TypeSet,
275+
Computed: true,
276+
Description: "IPv6 subnet.",
277+
Deprecated: "Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead.",
278+
Elem: &schema.Schema{
279+
Type: schema.TypeString,
280+
},
281+
},
282+
"ipv4": {
283+
Type: schema.TypeSet,
284+
Computed: true,
285+
Description: "IPv4 subnet.",
286+
Elem: &schema.Schema{
287+
Type: schema.TypeString,
288+
},
289+
},
290+
"ipv6": {
201291
Type: schema.TypeSet,
202292
Computed: true,
203293
Description: "IPv6 subnet.",
@@ -277,10 +367,12 @@ func dataSourceTencentCloudTeoOriginAclRead(d *schema.ResourceData, meta interfa
277367
if respData.OriginACLInfo.CurrentOriginACL.EntireAddresses != nil {
278368
if respData.OriginACLInfo.CurrentOriginACL.EntireAddresses.IPv4 != nil {
279369
entireAddressesMap["i_pv4"] = respData.OriginACLInfo.CurrentOriginACL.EntireAddresses.IPv4
370+
entireAddressesMap["ipv4"] = respData.OriginACLInfo.CurrentOriginACL.EntireAddresses.IPv4
280371
}
281372

282373
if respData.OriginACLInfo.CurrentOriginACL.EntireAddresses.IPv6 != nil {
283374
entireAddressesMap["i_pv6"] = respData.OriginACLInfo.CurrentOriginACL.EntireAddresses.IPv6
375+
entireAddressesMap["ipv6"] = respData.OriginACLInfo.CurrentOriginACL.EntireAddresses.IPv6
284376
}
285377

286378
currentOriginACLMap["entire_addresses"] = []interface{}{entireAddressesMap}
@@ -315,10 +407,12 @@ func dataSourceTencentCloudTeoOriginAclRead(d *schema.ResourceData, meta interfa
315407
if respData.OriginACLInfo.NextOriginACL.EntireAddresses != nil {
316408
if respData.OriginACLInfo.NextOriginACL.EntireAddresses.IPv4 != nil {
317409
entireAddressesMap["i_pv4"] = respData.OriginACLInfo.NextOriginACL.EntireAddresses.IPv4
410+
entireAddressesMap["ipv4"] = respData.OriginACLInfo.NextOriginACL.EntireAddresses.IPv4
318411
}
319412

320413
if respData.OriginACLInfo.NextOriginACL.EntireAddresses.IPv6 != nil {
321414
entireAddressesMap["i_pv6"] = respData.OriginACLInfo.NextOriginACL.EntireAddresses.IPv6
415+
entireAddressesMap["ipv6"] = respData.OriginACLInfo.NextOriginACL.EntireAddresses.IPv6
322416
}
323417

324418
nextOriginACLMap["entire_addresses"] = []interface{}{entireAddressesMap}
@@ -328,10 +422,12 @@ func dataSourceTencentCloudTeoOriginAclRead(d *schema.ResourceData, meta interfa
328422
if respData.OriginACLInfo.NextOriginACL.AddedAddresses != nil {
329423
if respData.OriginACLInfo.NextOriginACL.AddedAddresses.IPv4 != nil {
330424
addedAddressesMap["i_pv4"] = respData.OriginACLInfo.NextOriginACL.AddedAddresses.IPv4
425+
addedAddressesMap["ipv4"] = respData.OriginACLInfo.NextOriginACL.AddedAddresses.IPv4
331426
}
332427

333428
if respData.OriginACLInfo.NextOriginACL.AddedAddresses.IPv6 != nil {
334429
addedAddressesMap["i_pv6"] = respData.OriginACLInfo.NextOriginACL.AddedAddresses.IPv6
430+
addedAddressesMap["ipv6"] = respData.OriginACLInfo.NextOriginACL.AddedAddresses.IPv6
335431
}
336432

337433
nextOriginACLMap["added_addresses"] = []interface{}{addedAddressesMap}
@@ -341,10 +437,12 @@ func dataSourceTencentCloudTeoOriginAclRead(d *schema.ResourceData, meta interfa
341437
if respData.OriginACLInfo.NextOriginACL.RemovedAddresses != nil {
342438
if respData.OriginACLInfo.NextOriginACL.RemovedAddresses.IPv4 != nil {
343439
removedAddressesMap["i_pv4"] = respData.OriginACLInfo.NextOriginACL.RemovedAddresses.IPv4
440+
removedAddressesMap["ipv4"] = respData.OriginACLInfo.NextOriginACL.RemovedAddresses.IPv4
344441
}
345442

346443
if respData.OriginACLInfo.NextOriginACL.RemovedAddresses.IPv6 != nil {
347444
removedAddressesMap["i_pv6"] = respData.OriginACLInfo.NextOriginACL.RemovedAddresses.IPv6
445+
removedAddressesMap["ipv6"] = respData.OriginACLInfo.NextOriginACL.RemovedAddresses.IPv6
348446
}
349447

350448
nextOriginACLMap["removed_addresses"] = []interface{}{removedAddressesMap}
@@ -354,10 +452,12 @@ func dataSourceTencentCloudTeoOriginAclRead(d *schema.ResourceData, meta interfa
354452
if respData.OriginACLInfo.NextOriginACL.NoChangeAddresses != nil {
355453
if respData.OriginACLInfo.NextOriginACL.NoChangeAddresses.IPv4 != nil {
356454
noChangeAddressesMap["i_pv4"] = respData.OriginACLInfo.NextOriginACL.NoChangeAddresses.IPv4
455+
noChangeAddressesMap["ipv4"] = respData.OriginACLInfo.NextOriginACL.NoChangeAddresses.IPv4
357456
}
358457

359458
if respData.OriginACLInfo.NextOriginACL.NoChangeAddresses.IPv6 != nil {
360459
noChangeAddressesMap["i_pv6"] = respData.OriginACLInfo.NextOriginACL.NoChangeAddresses.IPv6
460+
noChangeAddressesMap["ipv6"] = respData.OriginACLInfo.NextOriginACL.NoChangeAddresses.IPv6
361461
}
362462

363463
nextOriginACLMap["no_change_addresses"] = []interface{}{noChangeAddressesMap}

‎website/docs/d/teo_origin_acl.html.markdown‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ Note: This field may return null, which indicates a failure to obtain a valid va
3939
Note: This field may return null, which indicates a failure to obtain a valid value.
4040
* `entire_addresses` - IP range details.
4141
Note: This field may return null, which indicates a failure to obtain a valid value.
42-
* `i_pv4` - IPv4 subnet.
43-
* `i_pv6` - IPv6 subnet.
42+
* `i_pv4` - (**Deprecated**) Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead. IPv4 subnet.
43+
* `i_pv6` - (**Deprecated**) Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead. IPv6 subnet.
44+
* `ipv4` - IPv4 subnet.
45+
* `ipv6` - IPv6 subnet.
4446
* `is_planed` - This parameter is used to record whether "I've upgraded to the lastest version" is completed before the origin ACLs version is effective. valid values:.
4547
- true: specifies that the version is effective and the update to the latest version is confirmed.
4648
- false: when the version takes effect, the confirmation of updating to the latest origin ACLs are not completed. The IP range is forcibly updated to the latest version in the backend. When this parameter returns false, please confirm in time whether your origin server firewall configuration has been updated to the latest version to avoid origin-pull failure.
@@ -52,18 +54,26 @@ Note: This field may return null, which indicates a failure to obtain a valid va
5254
* `next_origin_acl` - When the origin ACLs are updated, this field will be returned with the next version's origin IP range to take effect, including a comparison with the current origin IP range. This field is empty if not updated or origin protection is not enabled.
5355
Note: This field may return null, which indicates a failure to obtain a valid value.
5456
* `added_addresses` - The latest origin IP range newly-added compared with the origin IP range in CurrentOrginACL.
55-
* `i_pv4` - IPv4 subnet.
56-
* `i_pv6` - IPv6 subnet.
57+
* `i_pv4` - (**Deprecated**) Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead. IPv4 subnet.
58+
* `i_pv6` - (**Deprecated**) Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead. IPv6 subnet.
59+
* `ipv4` - IPv4 subnet.
60+
* `ipv6` - IPv6 subnet.
5761
* `entire_addresses` - IP range details.
58-
* `i_pv4` - IPv4 subnet.
59-
* `i_pv6` - IPv6 subnet.
62+
* `i_pv4` - (**Deprecated**) Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead. IPv4 subnet.
63+
* `i_pv6` - (**Deprecated**) Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead. IPv6 subnet.
64+
* `ipv4` - IPv4 subnet.
65+
* `ipv6` - IPv6 subnet.
6066
* `no_change_addresses` - The latest origin IP range is unchanged compared with the origin IP range in CurrentOrginACL.
61-
* `i_pv4` - IPv4 subnet.
62-
* `i_pv6` - IPv6 subnet.
67+
* `i_pv4` - (**Deprecated**) Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead. IPv4 subnet.
68+
* `i_pv6` - (**Deprecated**) Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead. IPv6 subnet.
69+
* `ipv4` - IPv4 subnet.
70+
* `ipv6` - IPv6 subnet.
6371
* `planned_active_time` - Version effective time, which adopts UTC+8 and follows the date and time format of the ISO 8601 standard.
6472
* `removed_addresses` - The latest origin IP range deleted compared with the origin IP range in CurrentOrginACL.
65-
* `i_pv4` - IPv4 subnet.
66-
* `i_pv6` - IPv6 subnet.
73+
* `i_pv4` - (**Deprecated**) Field `i_pv4` has been deprecated from version 1.82.27. Use new field `ipv4` instead. IPv4 subnet.
74+
* `i_pv6` - (**Deprecated**) Field `i_pv6` has been deprecated from version 1.82.27. Use new field `ipv6` instead. IPv6 subnet.
75+
* `ipv4` - IPv4 subnet.
76+
* `ipv6` - IPv6 subnet.
6777
* `version` - Version number.
6878
* `status` - Origin protection status. Vaild values:
6979
- online: in effect;

0 commit comments

Comments
 (0)