google_dns_managed_zone labels patching (#6062) (#4372)

modular-magician · web-flow · commit 2e8e88f868f9 · 2022-06-07T13:26:51.000-07:00
* Switch to PATCH for google_dns_managed_zone

Signed-off-by: Trung &lt;trung.hoang@pricehubble.com&gt;

* Limit changes to update_encoder

Signed-off-by: Trung &lt;trung.hoang@pricehubble.com&gt;

* Fix dns managed zone labels test

Signed-off-by: Trung &lt;trung.hoang@pricehubble.com&gt;

* Rename to managedZoneID

Signed-off-by: Trung &lt;trung.hoang@pricehubble.com&gt;

* Documentation and ignore managed_zone_id and creation_time

Signed-off-by: Trung &lt;trung.hoang@pricehubble.com&gt;

* Fix linter and comment format

Signed-off-by: Trung &lt;trung.hoang@pricehubble.com&gt;
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/6062.txt b/.changelog/6062.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+dns: fixed perma-diff for updated labels in `google_dns_managed_zone`
+```
diff --git a/google-beta/data_source_dns_managed_zone_test.go b/google-beta/data_source_dns_managed_zone_test.go
@@ -26,6 +26,9 @@ func TestAccDataSourceDnsManagedZone_basic(t *testing.T) {
 						"peering_config.#":            {},
 						"forwarding_config.#":         {},
 						"force_destroy":               {},
+						"labels.#":                    {},
+						"managed_zone_id":             {},
+						"creation_time":               {},
 						"reverse_lookup":              {},
 					},
 				),
diff --git a/google-beta/resource_dns_managed_zone.go b/google-beta/resource_dns_managed_zone.go
@@ -283,6 +283,17 @@ Ignored for 'public' visibility zones.`,
 while private zones are visible only to Virtual Private Cloud resources. Default value: "public" Possible values: ["private", "public"]`,
 				Default: "public",
 			},
+			"creation_time": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `The time that this resource was created on the server.
+This is in RFC3339 text format.`,
+			},
+			"managed_zone_id": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: `Unique identifier for the resource; defined by the server.`,
+			},
 			"name_servers": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -503,12 +514,18 @@ func resourceDNSManagedZoneRead(d *schema.ResourceData, meta interface{}) error
 	if err := d.Set("dnssec_config", flattenDNSManagedZoneDnssecConfig(res["dnssecConfig"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ManagedZone: %s", err)
 	}
+	if err := d.Set("managed_zone_id", flattenDNSManagedZoneManagedZoneID(res["id"], d, config)); err != nil {
+		return fmt.Errorf("Error reading ManagedZone: %s", err)
+	}
 	if err := d.Set("name", flattenDNSManagedZoneName(res["name"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ManagedZone: %s", err)
 	}
 	if err := d.Set("name_servers", flattenDNSManagedZoneNameServers(res["nameServers"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ManagedZone: %s", err)
 	}
+	if err := d.Set("creation_time", flattenDNSManagedZoneCreationTime(res["creationTime"], d, config)); err != nil {
+		return fmt.Errorf("Error reading ManagedZone: %s", err)
+	}
 	if err := d.Set("labels", flattenDNSManagedZoneLabels(res["labels"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ManagedZone: %s", err)
 	}
@@ -556,18 +573,36 @@ func resourceDNSManagedZoneUpdate(d *schema.ResourceData, meta interface{}) erro
 	} else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
 		obj["description"] = descriptionProp
 	}
+	dnsNameProp, err := expandDNSManagedZoneDnsName(d.Get("dns_name"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("dns_name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, dnsNameProp)) {
+		obj["dnsName"] = dnsNameProp
+	}
 	dnssecConfigProp, err := expandDNSManagedZoneDnssecConfig(d.Get("dnssec_config"), d, config)
 	if err != nil {
 		return err
 	} else if v, ok := d.GetOkExists("dnssec_config"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, dnssecConfigProp)) {
 		obj["dnssecConfig"] = dnssecConfigProp
 	}
+	nameProp, err := expandDNSManagedZoneName(d.Get("name"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, nameProp)) {
+		obj["name"] = nameProp
+	}
 	labelsProp, err := expandDNSManagedZoneLabels(d.Get("labels"), d, config)
 	if err != nil {
 		return err
 	} else if v, ok := d.GetOkExists("labels"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, labelsProp)) {
 		obj["labels"] = labelsProp
 	}
+	visibilityProp, err := expandDNSManagedZoneVisibility(d.Get("visibility"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("visibility"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, visibilityProp)) {
+		obj["visibility"] = visibilityProp
+	}
 	privateVisibilityConfigProp, err := expandDNSManagedZonePrivateVisibilityConfig(d.Get("private_visibility_config"), d, config)
 	if err != nil {
 		return err
@@ -586,6 +621,23 @@ func resourceDNSManagedZoneUpdate(d *schema.ResourceData, meta interface{}) erro
 	} else if v, ok := d.GetOkExists("peering_config"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, peeringConfigProp)) {
 		obj["peeringConfig"] = peeringConfigProp
 	}
+	reverseLookupConfigProp, err := expandDNSManagedZoneReverseLookup(d.Get("reverse_lookup"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("reverse_lookup"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, reverseLookupConfigProp)) {
+		obj["reverseLookupConfig"] = reverseLookupConfigProp
+	}
+	serviceDirectoryConfigProp, err := expandDNSManagedZoneServiceDirectoryConfig(d.Get("service_directory_config"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("service_directory_config"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, serviceDirectoryConfigProp)) {
+		obj["serviceDirectoryConfig"] = serviceDirectoryConfigProp
+	}
+
+	obj, err = resourceDNSManagedZoneUpdateEncoder(d, meta, obj)
+	if err != nil {
+		return err
+	}
 
 	url, err := replaceVars(d, config, "{{DNSBasePath}}projects/{{project}}/managedZones/{{name}}")
 	if err != nil {
@@ -599,7 +651,7 @@ func resourceDNSManagedZoneUpdate(d *schema.ResourceData, meta interface{}) erro
 		billingProject = bp
 	}
 
-	res, err := sendRequestWithTimeout(config, "PATCH", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
+	res, err := sendRequestWithTimeout(config, "PUT", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutUpdate))
 
 	if err != nil {
 		return fmt.Errorf("Error updating ManagedZone %q: %s", d.Id(), err)
@@ -831,6 +883,23 @@ func flattenDNSManagedZoneDnssecConfigDefaultKeySpecsKind(v interface{}, d *sche
 	return v
 }
 
+func flattenDNSManagedZoneManagedZoneID(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	// Handles the string fixed64 format
+	if strVal, ok := v.(string); ok {
+		if intVal, err := stringToFixed64(strVal); err == nil {
+			return intVal
+		}
+	}
+
+	// number values are represented as float64
+	if floatVal, ok := v.(float64); ok {
+		intVal := int(floatVal)
+		return intVal
+	}
+
+	return v // let terraform core handle it otherwise
+}
+
 func flattenDNSManagedZoneName(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -839,6 +908,10 @@ func flattenDNSManagedZoneNameServers(v interface{}, d *schema.ResourceData, con
 	return v
 }
 
+func flattenDNSManagedZoneCreationTime(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenDNSManagedZoneLabels(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -1379,3 +1452,17 @@ func expandDNSManagedZoneServiceDirectoryConfigNamespaceNamespaceUrl(v interface
 	}
 	return url, nil
 }
+
+func resourceDNSManagedZoneUpdateEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
+	// The upstream update method (https://cloud.google.com/dns/docs/reference/v1/managedZones/update)
+	// requires the full ManagedZones object, therefore, we need to keep some input only values in the struct
+	// and then reuse it in the update
+	nameServers, ok := d.GetOkExists("name_servers")
+	if !ok {
+		nameServers = []string{}
+	}
+	obj["nameServers"] = nameServers
+	obj["id"] = d.Get("managed_zone_id")
+	obj["creationTime"] = d.Get("creation_time")
+	return obj, nil
+}
diff --git a/google-beta/resource_dns_managed_zone_test.go b/google-beta/resource_dns_managed_zone_test.go
@@ -20,15 +20,15 @@ func TestAccDNSManagedZone_update(t *testing.T) {
 		CheckDestroy: testAccCheckDNSManagedZoneDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDnsManagedZone_basic(zoneSuffix, "description1"),
+				Config: testAccDnsManagedZone_basic(zoneSuffix, "description1", map[string]string{"foo": "bar", "ping": "pong"}),
 			},
 			{
 				ResourceName:      "google_dns_managed_zone.foobar",
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccDnsManagedZone_basic(zoneSuffix, "description2"),
+				Config: testAccDnsManagedZone_basic(zoneSuffix, "description2", map[string]string{"foo": "bar"}),
 			},
 			{
 				ResourceName:      "google_dns_managed_zone.foobar",
@@ -256,19 +256,20 @@ resource "google_dns_managed_zone" "foobar" {
 `, suffix, suffix)
 }
 
-func testAccDnsManagedZone_basic(suffix, description string) string {
+func testAccDnsManagedZone_basic(suffix, description string, labels map[string]string) string {
+	labelsRep := ""
+	for k, v := range labels {
+		labelsRep += fmt.Sprintf("%s = %q, ", k, v)
+	}
 	return fmt.Sprintf(`
 resource "google_dns_managed_zone" "foobar" {
   name        = "mzone-test-%s"
   dns_name    = "tf-acctest-%s.hashicorptest.com."
   description = "%s"
-  labels = {
-    foo = "bar"
-  }
-
+  labels 	  = {%s}
   visibility = "public"
 }
-`, suffix, suffix, description)
+`, suffix, suffix, description, labelsRep)
 }
 
 func testAccDnsManagedZone_dnssec_on(suffix string) string {
diff --git a/website/docs/r/dns_managed_zone.html.markdown b/website/docs/r/dns_managed_zone.html.markdown
@@ -424,10 +424,17 @@ In addition to the arguments listed above, the following computed attributes are
 
 * `id` - an identifier for the resource with format `projects/{{project}}/managedZones/{{name}}`
 
+* `managed_zone_id` -
+  Unique identifier for the resource; defined by the server.
+
 * `name_servers` -
   Delegate your managed_zone to these virtual name servers;
   defined by the server
 
+* `creation_time` -
+  The time that this resource was created on the server.
+  This is in RFC3339 text format.
+
 
 ## Timeouts
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+dns: fixed perma-diff for updated labels in `google_dns_managed_zone`
	`3`	+```