ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13671 from JDiPierro/google_address_name_fix 

provider/google: Set name field when reading addresses
This commit is contained in:
Paddy 2017-04-20 13:14:57 -07:00 committed by GitHub
parent 565f0a4e0f 046cc9b9aa
commit 600a117301
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/providers/google/resource_compute_address.go
View File

@ -15,10 +15,7 @@ func resourceComputeAddress() *schema.Resource {
Read: resourceComputeAddressRead, Read: resourceComputeAddressRead,
Delete: resourceComputeAddressDelete, Delete: resourceComputeAddressDelete,
Importer: &schema.ResourceImporter{ Importer: &schema.ResourceImporter{
State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { State: schema.ImportStatePassthrough,
d.Set("name", d.Id())
return []*schema.ResourceData{d}, nil
},
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": &schema.Schema{
@ -113,6 +110,7 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error
d.Set("address", addr.Address) d.Set("address", addr.Address)
d.Set("self_link", addr.SelfLink) d.Set("self_link", addr.SelfLink)
d.Set("name", addr.Name)
return nil return nil
} }

6
builtin/providers/google/resource_compute_global_address.go
View File

@ -15,10 +15,7 @@ func resourceComputeGlobalAddress() *schema.Resource {
Read: resourceComputeGlobalAddressRead, Read: resourceComputeGlobalAddressRead,
Delete: resourceComputeGlobalAddressDelete, Delete: resourceComputeGlobalAddressDelete,
Importer: &schema.ResourceImporter{ Importer: &schema.ResourceImporter{
State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { State: schema.ImportStatePassthrough,
d.Set("name", d.Id())
return []*schema.ResourceData{d}, nil
},
}, },
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": &schema.Schema{
@ -97,6 +94,7 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{})
d.Set("address", addr.Address) d.Set("address", addr.Address)
d.Set("self_link", addr.SelfLink) d.Set("self_link", addr.SelfLink)
d.Set("name", addr.Name)
return nil return nil
} }