From fe5e2ab2a520b80413205fa0b5df3f16b2905d8c Mon Sep 17 00:00:00 2001 From: Justin DiPierro Date: Fri, 14 Apr 2017 14:58:44 -0400 Subject: [PATCH] Google Addresses: Set name field on read --- resource_compute_address.go | 6 ++---- resource_compute_global_address.go | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/resource_compute_address.go b/resource_compute_address.go index 54a60cc0..27b4c180 100644 --- a/resource_compute_address.go +++ b/resource_compute_address.go @@ -15,10 +15,7 @@ func resourceComputeAddress() *schema.Resource { Read: resourceComputeAddressRead, Delete: resourceComputeAddressDelete, Importer: &schema.ResourceImporter{ - State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - d.Set("name", d.Id()) - return []*schema.ResourceData{d}, nil - }, + State: schema.ImportStatePassthrough, }, Schema: map[string]*schema.Schema{ "name": &schema.Schema{ @@ -113,6 +110,7 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error d.Set("address", addr.Address) d.Set("self_link", addr.SelfLink) + d.Set("name", addr.Name) return nil } diff --git a/resource_compute_global_address.go b/resource_compute_global_address.go index 7f4df04a..bf6a6a6d 100644 --- a/resource_compute_global_address.go +++ b/resource_compute_global_address.go @@ -15,10 +15,7 @@ func resourceComputeGlobalAddress() *schema.Resource { Read: resourceComputeGlobalAddressRead, Delete: resourceComputeGlobalAddressDelete, Importer: &schema.ResourceImporter{ - State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - d.Set("name", d.Id()) - return []*schema.ResourceData{d}, nil - }, + State: schema.ImportStatePassthrough, }, Schema: map[string]*schema.Schema{ "name": &schema.Schema{ @@ -97,6 +94,7 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) d.Set("address", addr.Address) d.Set("self_link", addr.SelfLink) + d.Set("name", addr.Name) return nil }