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

Revert "Do not read or flatten url_param_only properties in Terraform" (#3579)

Browse Source 
Signed-off-by: Modular Magician <magic-modules@google.com>
This commit is contained in:
The Magician 2019-05-07 10:39:06 -07:00 committed by Chris Stephens
parent 5a9891c219
commit fc2fb899ec
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
google/resource_filestore_instance.go
View File

@ -232,6 +232,9 @@ func resourceFilestoreInstanceRead(d *schema.ResourceData, meta interface{}) err
return fmt.Errorf("Error reading Instance: %s", err)
}
if err := d.Set("name", flattenFilestoreInstanceName(res["name"], d)); err != nil {
return fmt.Errorf("Error reading Instance: %s", err)
}
if err := d.Set("description", flattenFilestoreInstanceDescription(res["description"], d)); err != nil {
return fmt.Errorf("Error reading Instance: %s", err)
}
@ -375,6 +378,13 @@ func resourceFilestoreInstanceImport(d *schema.ResourceData, meta interface{}) (
return []*schema.ResourceData{d}, nil
}
func flattenFilestoreInstanceName(v interface{}, d *schema.ResourceData) interface{} {
if v == nil {
return v
}
return NameFromSelfLinkStateFunc(v)
}
func flattenFilestoreInstanceDescription(v interface{}, d *schema.ResourceData) interface{} {
return v
}