Send empty privateVisibilityConfig network array (#3865) (#7022)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Aug 13, 2020 · 9c9430f · 9c9430f
1 parent f90c2c0
commit 9c9430f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.changelog/3865.txt b/.changelog/3865.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+dns: fixed an issue where `google_dns_managed_zone` would not remove `private_visibility_config` on updates
+```
diff --git a/google/resource_dns_managed_zone.go b/google/resource_dns_managed_zone.go
@@ -344,7 +344,7 @@ func resourceDNSManagedZoneCreate(d *schema.ResourceData, meta interface{}) erro
 	privateVisibilityConfigProp, err := expandDNSManagedZonePrivateVisibilityConfig(d.Get("private_visibility_config"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("private_visibility_config"); !isEmptyValue(reflect.ValueOf(privateVisibilityConfigProp)) && (ok || !reflect.DeepEqual(v, privateVisibilityConfigProp)) {
+	} else if v, ok := d.GetOkExists("private_visibility_config"); ok || !reflect.DeepEqual(v, privateVisibilityConfigProp) {
 		obj["privateVisibilityConfig"] = privateVisibilityConfigProp
 	}
 	forwardingConfigProp, err := expandDNSManagedZoneForwardingConfig(d.Get("forwarding_config"), d, config)
@@ -472,7 +472,7 @@ func resourceDNSManagedZoneUpdate(d *schema.ResourceData, meta interface{}) erro
 	privateVisibilityConfigProp, err := expandDNSManagedZonePrivateVisibilityConfig(d.Get("private_visibility_config"), d, config)
 	if err != nil {
 		return err
-	} else if v, ok := d.GetOkExists("private_visibility_config"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, privateVisibilityConfigProp)) {
+	} else if v, ok := d.GetOkExists("private_visibility_config"); ok || !reflect.DeepEqual(v, privateVisibilityConfigProp) {
 		obj["privateVisibilityConfig"] = privateVisibilityConfigProp
 	}
 	forwardingConfigProp, err := expandDNSManagedZoneForwardingConfig(d.Get("forwarding_config"), d, config)
@@ -924,7 +924,11 @@ func expandDNSManagedZoneVisibility(v interface{}, d TerraformResourceData, conf
 func expandDNSManagedZonePrivateVisibilityConfig(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {
-		return nil, nil
+		// The API won't remove the the field unless an empty network array is sent.
+		transformed := make(map[string]interface{})
+		emptyNetwork := make([]interface{}, 0)
+		transformed["networks"] = emptyNetwork
+		return transformed, nil
 	}
 	raw := l[0]
 	original := raw.(map[string]interface{})