google_dns_managed_zone labels patching

mmv1/products/dns/api.yaml

@@ -32,7 +32,7 @@ objects:
     name: 'ManagedZone'
     kind: 'dns#managedZone'
     base_url: 'projects/{{project}}/managedZones'
-    update_verb: :PATCH
+    update_verb: :PUT
     description: |
       A zone is a subtree of the DNS namespace under one administrative
       responsibility. A ManagedZone is a resource that represents a DNS zone

mmv1/products/dns/terraform.yaml

@@ -52,8 +52,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           zone_name: "peering-zone"
           network_name: "network"
     properties:
-      creationTime: !ruby/object:Overrides::Terraform::PropertyOverride
-        exclude: true
       description: !ruby/object:Overrides::Terraform::PropertyOverride
         description: |
           A textual description field. Defaults to 'Managed by Terraform'.
@@ -64,7 +62,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
       dnssecConfig.nonExistence: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
       id: !ruby/object:Overrides::Terraform::PropertyOverride
-        exclude: true
+        name: 'managedZoneID'
       nameServerSet: !ruby/object:Overrides::Terraform::PropertyOverride
         exclude: true
       privateVisibilityConfig: !ruby/object:Overrides::Terraform::PropertyOverride
@@ -137,6 +135,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         description: 'Set this true to delete all records in the zone.'
         default_value: false
     custom_code: !ruby/object:Provider::Terraform::CustomCode
+      update_encoder: templates/terraform/update_encoder/managed_dns_zone.go.erb
       pre_delete: templates/terraform/pre_delete/managed_dns_zone.go.erb
   Policy: !ruby/object:Overrides::Terraform::ResourceOverride
     id_format: 'projects/{{project}}/policies/{{name}}'

mmv1/templates/terraform/update_encoder/managed_dns_zone.go.erb

@@ -0,0 +1,11 @@
+    // 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

mmv1/third_party/terraform/tests/data_source_dns_managed_zone_test.go.erb

@@ -27,6 +27,9 @@ func TestAccDataSourceDnsManagedZone_basic(t *testing.T) {
 						"peering_config.#":            {},
 						"forwarding_config.#":         {},
 						"force_destroy":               {},
+						"labels.#": 				   {},
+						"managed_zone_id": 			   {},
+						"creation_time": 			   {},
 <% unless version == "ga" -%>
 						"reverse_lookup":         {},
 <% end -%>

mmv1/third_party/terraform/tests/resource_dns_managed_zone_test.go.erb

@@ -21,15 +21,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",
@@ -259,19 +259,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 {