Skip to content

Commit

Permalink
display_name not in response (hashicorp#6867) (hashicorp#4925)
Browse files Browse the repository at this point in the history
* display_name not in response

* use ignore_read instead

Co-authored-by: Edward Sun <sunedward@google.com>
Signed-off-by: Modular Magician <magic-modules@google.com>

Signed-off-by: Modular Magician <magic-modules@google.com>
Co-authored-by: Edward Sun <sunedward@google.com>
  • Loading branch information
modular-magician and Edward Sun authored Nov 29, 2022
1 parent ae4d0f8 commit 04ec1a6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .changelog/6867.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
alloydb: fixed permdiff on `display_name` of `google_alloydb_instance`
```
7 changes: 0 additions & 7 deletions google-beta/resource_alloydb_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,6 @@ func resourceAlloydbInstanceRead(d *schema.ResourceData, meta interface{}) error
if err := d.Set("state", flattenAlloydbInstanceState(res["state"], d, config)); err != nil {
return fmt.Errorf("Error reading Instance: %s", err)
}
if err := d.Set("display_name", flattenAlloydbInstanceDisplayName(res["displayName"], d, config)); err != nil {
return fmt.Errorf("Error reading Instance: %s", err)
}
if err := d.Set("gce_zone", flattenAlloydbInstanceGceZone(res["gceZone"], d, config)); err != nil {
return fmt.Errorf("Error reading Instance: %s", err)
}
Expand Down Expand Up @@ -569,10 +566,6 @@ func flattenAlloydbInstanceState(v interface{}, d *schema.ResourceData, config *
return v
}

func flattenAlloydbInstanceDisplayName(v interface{}, d *schema.ResourceData, config *Config) interface{} {
return v
}

func flattenAlloydbInstanceGceZone(v interface{}, d *schema.ResourceData, config *Config) interface{} {
return v
}
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_alloydb_instance_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestAccAlloydbInstance_alloydbInstanceBasicExample(t *testing.T) {
ResourceName: "google_alloydb_instance.default",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"cluster", "instance_id", "reconciling", "update_time"},
ImportStateVerifyIgnore: []string{"display_name", "cluster", "instance_id", "reconciling", "update_time"},
},
},
})
Expand Down

0 comments on commit 04ec1a6

Please sign in to comment.