Skip to content

Commit

Permalink
Revert "Subnetnetwork: replaced ipv6CidrRange with internalIpV6Prefix…
Browse files Browse the repository at this point in the history
…" (#8479) (#5974)

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored and shuyama1 committed Jul 28, 2023
1 parent d994ae6 commit 600bced
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .changelog/8479.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
```release-note: none
```
6 changes: 3 additions & 3 deletions google-beta/services/compute/resource_compute_subnetwork.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ If not specified IPV4_ONLY will be used. Possible values: ["IPV4_ONLY", "IPV4_IP
Description: `The gateway address for default routes to reach destination addresses
outside this subnetwork.`,
},
"internal_ipv6_prefix": {
"ipv6_cidr_range": {
Type: schema.TypeString,
Computed: true,
Description: `The range of internal IPv6 addresses that are owned by this subnetwork.`,
Expand Down Expand Up @@ -586,7 +586,7 @@ func resourceComputeSubnetworkRead(d *schema.ResourceData, meta interface{}) err
if err := d.Set("ipv6_access_type", flattenComputeSubnetworkIpv6AccessType(res["ipv6AccessType"], d, config)); err != nil {
return fmt.Errorf("Error reading Subnetwork: %s", err)
}
if err := d.Set("internal_ipv6_prefix", flattenComputeSubnetworkInternalIpv6Prefix(res["internalIpv6Prefix"], d, config)); err != nil {
if err := d.Set("ipv6_cidr_range", flattenComputeSubnetworkIpv6CidrRange(res["ipv6CidrRange"], d, config)); err != nil {
return fmt.Errorf("Error reading Subnetwork: %s", err)
}
if err := d.Set("external_ipv6_prefix", flattenComputeSubnetworkExternalIpv6Prefix(res["externalIpv6Prefix"], d, config)); err != nil {
Expand Down Expand Up @@ -1170,7 +1170,7 @@ func flattenComputeSubnetworkIpv6AccessType(v interface{}, d *schema.ResourceDat
return v
}

func flattenComputeSubnetworkInternalIpv6Prefix(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
func flattenComputeSubnetworkIpv6CidrRange(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/compute_subnetwork.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ In addition to the arguments listed above, the following computed attributes are
The gateway address for default routes to reach destination addresses
outside this subnetwork.

* `internal_ipv6_prefix` -
* `ipv6_cidr_range` -
The range of internal IPv6 addresses that are owned by this subnetwork.

* `external_ipv6_prefix` -
Expand Down

0 comments on commit 600bced

Please sign in to comment.