Skip to content

Commit c8f8e7b

Browse files
SevenEarthSevenEarth
authored
fix(vpc): [123705166] tencentcloud_vpc_ipv6_cidr_block update ipv6_cidr_block return value (#3336)
* add * add * add * add
1 parent 0359644 commit c8f8e7b

File tree

8 files changed

+84
-52
lines changed

8 files changed

+84
-52
lines changed

‎.changelog/3336.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_vpc_ipv6_cidr_block: update `ipv6_cidr_block` return value
3+
```

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1128
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111
@@ -96,7 +96,7 @@ require (
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
9797
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
9898
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860
99-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148
99+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154
100100
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149
101101
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792
102102
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199

‎go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149 h1:a2N
959959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
960960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153 h1:g/aw2nrrMfO/+sdBPCFsiq+sgSFNiUK/sAci6PT4O4E=
961961
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
962+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1150 h1:r/cHvpMZ0oO5/HOuSsPdq3Dj1YX4pF0mhZS7G5gWKEs=
963+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1150/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
964+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154 h1:tc2GXLGwpjaZdapd7pEpUjoeWU5gl3XUuZzDEyes7fg=
965+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
962966
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
963967
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
964968
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -1087,6 +1091,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1122 h1:K9uRab
10871091
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1122/go.mod h1:8xCo14lGkAvl5EhpYpmLk5ztoFcHdpBLzLzAawxjl+Y=
10881092
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148 h1:qtzL3QscVftBw9ZVKI7fmebCkc6zL+3zSkRFtj77HpI=
10891093
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148/go.mod h1:NHVGgF5BAXq5emdefxsC+P1/MsL3ryr5s2jHpxDTYJM=
1094+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1150 h1:DEOwGw/GjYHSTDbk6ZGFPyVPCFaZ3kK2En4aswJM6V0=
1095+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1150/go.mod h1:xmUzmpMFL+gDWPGoIkYcHNeMfRt8rHsV7EtEP31PRco=
1096+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154 h1:PpVmHKrNt9fqIuH2wVKRPAquTM9quK2LduDAoVH39gE=
1097+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154/go.mod h1:DKh7HURi/7PY/UMjeuLcAxh1jEDdfYu9ptw12hDTw04=
10901098
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1037 h1:sgHOHqVFcO266dnoh0KJ0CoxrRglRZYKW78iBh41Giw=
10911099
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1037/go.mod h1:QM5m6aZ65kaxaES0D44BNKmemn+9WBf5vr3HDDPrh8U=
10921100
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1147 h1:SxZsn9N4c1yx40kZOINIh9AnUKcgChUWbZoDiv6VvmQ=

‎tencentcloud/services/vpc/resource_tc_vpc_ipv6_cidr_block.go

Lines changed: 49 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,32 @@ func ResourceTencentCloudVpcIpv6CidrBlock() *schema.Resource {
4040
"ipv6_cidr_block": {
4141
Type: schema.TypeString,
4242
Computed: true,
43-
Description: "ipv6 cidr block.",
43+
Description: "Ipv6 cidr block.",
44+
},
45+
46+
"ipv6_cidr_block_set": {
47+
Type: schema.TypeList,
48+
Computed: true,
49+
Description: "Ipv6 cidr block set.",
50+
Elem: &schema.Resource{
51+
Schema: map[string]*schema.Schema{
52+
"ipv6_cidr_block": {
53+
Type: schema.TypeString,
54+
Computed: true,
55+
Description: "Ipv6 cidr block.",
56+
},
57+
"address_type": {
58+
Type: schema.TypeString,
59+
Computed: true,
60+
Description: "Apply for the type of IPv6 Cidr, GUA (Global Unicast Address), ULA (Unique Local Address).",
61+
},
62+
"isp_type": {
63+
Type: schema.TypeString,
64+
Computed: true,
65+
Description: "Range of network operator types: 'BGP' - default, 'CMCC' - China Mobile, 'CTCC' - China Telecom, 'CUCC' - China Joint Debugging.",
66+
},
67+
},
68+
},
4469
},
4570
},
4671
}
@@ -112,14 +137,33 @@ func resourceTencentCloudVpcIpv6CidrBlockRead(d *schema.ResourceData, meta inter
112137
_ = d.Set("vpc_id", instance.VpcId)
113138
}
114139

115-
if instance.Ipv6CidrBlockSet != nil && len(instance.Ipv6CidrBlockSet) != 0 {
116-
_ = d.Set("address_type", instance.Ipv6CidrBlockSet[0].AddressType)
117-
}
118-
119140
if instance.Ipv6CidrBlock != nil {
120141
_ = d.Set("ipv6_cidr_block", instance.Ipv6CidrBlock)
121142
}
122143

144+
if instance.Ipv6CidrBlockSet != nil && len(instance.Ipv6CidrBlockSet) > 0 {
145+
tmpList := make([]map[string]interface{}, 0, len(instance.Ipv6CidrBlockSet))
146+
for _, item := range instance.Ipv6CidrBlockSet {
147+
dMap := make(map[string]interface{})
148+
if item.IPv6CidrBlock != nil {
149+
dMap["ipv6_cidr_block"] = item.IPv6CidrBlock
150+
}
151+
152+
if item.AddressType != nil {
153+
dMap["address_type"] = item.AddressType
154+
_ = d.Set("address_type", item.AddressType)
155+
}
156+
157+
if item.ISPType != nil {
158+
dMap["isp_type"] = item.ISPType
159+
}
160+
161+
tmpList = append(tmpList, dMap)
162+
}
163+
164+
_ = d.Set("ipv6_cidr_block_set", tmpList)
165+
}
166+
123167
return nil
124168
}
125169

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go

Lines changed: 14 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
11661166
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
11671167
## explicit; go 1.14
11681168
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
1169-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153
1169+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154
11701170
## explicit; go 1.11
11711171
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
11721172
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors
@@ -1349,7 +1349,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf/v20180326
13491349
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860
13501350
## explicit; go 1.14
13511351
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717
1352-
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148
1352+
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154
13531353
## explicit; go 1.14
13541354
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312
13551355
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ The following arguments are supported:
4545
In addition to all arguments above, the following attributes are exported:
4646

4747
* `id` - ID of the resource.
48-
* `ipv6_cidr_block` - ipv6 cidr block.
48+
* `ipv6_cidr_block_set` - Ipv6 cidr block set.
49+
* `address_type` - Apply for the type of IPv6 Cidr, GUA (Global Unicast Address), ULA (Unique Local Address).
50+
* `ipv6_cidr_block` - Ipv6 cidr block.
51+
* `isp_type` - Range of network operator types: 'BGP' - default, 'CMCC' - China Mobile, 'CTCC' - China Telecom, 'CUCC' - China Joint Debugging.
52+
* `ipv6_cidr_block` - Ipv6 cidr block.
4953

5054

5155
## Import

0 commit comments

Comments
 (0)