public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-10-01 16:21:06 +00:00
Code Issues Projects Releases Wiki Activity

Remove stale comments and checks for beta API in address (#1442)

Browse Source 
* Remove stale comments and check around beta API

* Add the check for empty addresstype
This commit is contained in:
Vincent Roseberry 2018-05-07 15:04:20 -07:00 committed by GitHub
parent f268be1d8f
commit b7ae1e77bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
google/resource_compute_address.go
View File

@ -32,8 +32,6 @@ func resourceComputeAddress() *schema.Resource {
SchemaVersion: 1,
MigrateState: resourceComputeAddressMigrateState,
// These fields mostly correlate to the fields in the beta Address
// resource. See https://cloud.google.com/compute/docs/reference/beta/addresses#resource
Schema: map[string]*schema.Schema{
"name": &schema.Schema{
Type: schema.TypeString,
@ -144,16 +142,14 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error
return handleNotFoundError(err, d, fmt.Sprintf("Address %q", d.Get("name").(string)))
}
// The v1 API does not include an AddressType field, as it only supports
// external addresses. An empty AddressType implies a v1 address that has
// been converted to v0beta, and thus an EXTERNAL address.
d.Set("address_type", addr.AddressType)
// The API returns an empty AddressType for EXTERNAL address.
if addr.AddressType == "" {
d.Set("address_type", addressTypeExternal)
}
d.Set("subnetwork", ConvertSelfLinkToV1(addr.Subnetwork))
d.Set("subnetwork", addr.Subnetwork)
d.Set("address", addr.Address)
d.Set("self_link", ConvertSelfLinkToV1(addr.SelfLink))
d.Set("self_link", addr.SelfLink)
d.Set("name", addr.Name)
d.Set("project", addressId.Project)
d.Set("region", GetResourceNameFromSelfLink(addr.Region))