From fc2fb899ece28a300819df0bb737f0edd992c32e Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 7 May 2019 10:39:06 -0700 Subject: [PATCH] Revert "Do not read or flatten url_param_only properties in Terraform" (#3579) Signed-off-by: Modular Magician --- google/resource_filestore_instance.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/google/resource_filestore_instance.go b/google/resource_filestore_instance.go index 1a799631..917554b5 100644 --- a/google/resource_filestore_instance.go +++ b/google/resource_filestore_instance.go @@ -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 }