Skip to content

fix(vpc): [123705166] tencentcloud_vpc_ipv6_cidr_block update ipv6_cidr_block return value #3336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 28, 2025
Merged

fix(vpc): [123705166] tencentcloud_vpc_ipv6_cidr_block update ipv6_cidr_block return value #3336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa9e721
add
SevenEarth Apr 28, 2025
791cc7e
add
SevenEarth Apr 28, 2025
950163a
add
SevenEarth Apr 28, 2025
78b66b5
add
SevenEarth Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3336.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_vpc_ipv6_cidr_block: update `ipv6_cidr_block` return value
```
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1128
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1111
Expand Down Expand Up @@ -96,7 +96,7 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf v1.0.674
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wedata v1.0.792
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199
Expand Down
8 changes: 8 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149 h1:a2N
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1149/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153 h1:g/aw2nrrMfO/+sdBPCFsiq+sgSFNiUK/sAci6PT4O4E=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1150 h1:r/cHvpMZ0oO5/HOuSsPdq3Dj1YX4pF0mhZS7G5gWKEs=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1150/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154 h1:tc2GXLGwpjaZdapd7pEpUjoeWU5gl3XUuZzDEyes7fg=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
Expand Down Expand Up @@ -1087,6 +1091,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1122 h1:K9uRab
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1122/go.mod h1:8xCo14lGkAvl5EhpYpmLk5ztoFcHdpBLzLzAawxjl+Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148 h1:qtzL3QscVftBw9ZVKI7fmebCkc6zL+3zSkRFtj77HpI=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148/go.mod h1:NHVGgF5BAXq5emdefxsC+P1/MsL3ryr5s2jHpxDTYJM=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1150 h1:DEOwGw/GjYHSTDbk6ZGFPyVPCFaZ3kK2En4aswJM6V0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1150/go.mod h1:xmUzmpMFL+gDWPGoIkYcHNeMfRt8rHsV7EtEP31PRco=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154 h1:PpVmHKrNt9fqIuH2wVKRPAquTM9quK2LduDAoVH39gE=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154/go.mod h1:DKh7HURi/7PY/UMjeuLcAxh1jEDdfYu9ptw12hDTw04=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1037 h1:sgHOHqVFcO266dnoh0KJ0CoxrRglRZYKW78iBh41Giw=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1037/go.mod h1:QM5m6aZ65kaxaES0D44BNKmemn+9WBf5vr3HDDPrh8U=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1147 h1:SxZsn9N4c1yx40kZOINIh9AnUKcgChUWbZoDiv6VvmQ=
Expand Down
54 changes: 49 additions & 5 deletions tencentcloud/services/vpc/resource_tc_vpc_ipv6_cidr_block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,32 @@ func ResourceTencentCloudVpcIpv6CidrBlock() *schema.Resource {
"ipv6_cidr_block": {
Type: schema.TypeString,
Computed: true,
Description: "ipv6 cidr block.",
Description: "Ipv6 cidr block.",
},

"ipv6_cidr_block_set": {
Type: schema.TypeList,
Computed: true,
Description: "Ipv6 cidr block set.",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"ipv6_cidr_block": {
Type: schema.TypeString,
Computed: true,
Description: "Ipv6 cidr block.",
},
"address_type": {
Type: schema.TypeString,
Computed: true,
Description: "Apply for the type of IPv6 Cidr, GUA (Global Unicast Address), ULA (Unique Local Address).",
},
"isp_type": {
Type: schema.TypeString,
Computed: true,
Description: "Range of network operator types: 'BGP' - default, 'CMCC' - China Mobile, 'CTCC' - China Telecom, 'CUCC' - China Joint Debugging.",
},
},
},
},
},
}
Expand Down Expand Up @@ -112,14 +137,33 @@ func resourceTencentCloudVpcIpv6CidrBlockRead(d *schema.ResourceData, meta inter
_ = d.Set("vpc_id", instance.VpcId)
}

if instance.Ipv6CidrBlockSet != nil && len(instance.Ipv6CidrBlockSet) != 0 {
_ = d.Set("address_type", instance.Ipv6CidrBlockSet[0].AddressType)
}

if instance.Ipv6CidrBlock != nil {
_ = d.Set("ipv6_cidr_block", instance.Ipv6CidrBlock)
}

if instance.Ipv6CidrBlockSet != nil && len(instance.Ipv6CidrBlockSet) > 0 {
tmpList := make([]map[string]interface{}, 0, len(instance.Ipv6CidrBlockSet))
for _, item := range instance.Ipv6CidrBlockSet {
dMap := make(map[string]interface{})
if item.IPv6CidrBlock != nil {
dMap["ipv6_cidr_block"] = item.IPv6CidrBlock
}

if item.AddressType != nil {
dMap["address_type"] = item.AddressType
_ = d.Set("address_type", item.AddressType)
}

if item.ISPType != nil {
dMap["isp_type"] = item.ISPType
}

tmpList = append(tmpList, dMap)
}

_ = d.Set("ipv6_cidr_block_set", tmpList)
}

return nil
}

Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 14 additions & 41 deletions vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
## explicit; go 1.14
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1153
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1154
## explicit; go 1.11
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors
Expand Down Expand Up @@ -1349,7 +1349,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tsf/v20180326
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.860
## explicit; go 1.14
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod/v20180717
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1148
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.1154
## explicit; go 1.14
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312
# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/waf v1.0.1149
Expand Down
6 changes: 5 additions & 1 deletion website/docs/r/vpc_ipv6_cidr_block.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ The following arguments are supported:
In addition to all arguments above, the following attributes are exported:

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


## Import
Expand Down
Loading