serviceDirectory: add beta compatibility after GA promotion (GoogleCloudPlatform#15970)

Author: BBBmau

mmv1/products/servicedirectory/Endpoint.yaml

@@ -24,7 +24,6 @@ base_url: '{{name}}'
 self_link: '{{name}}'
 create_url: '{{service}}/endpoints?endpointId={{endpoint_id}}'
 update_verb: 'PATCH'
-update_mask: true
 import_format:
   - 'projects/{{project}}/locations/{{location}}/namespaces/{{namespace_id}}/services/{{service_id}}/endpoints/{{endpoint_id}}'
 timeouts:
@@ -35,7 +34,7 @@ custom_code:
   custom_import: 'templates/terraform/custom_import/service_directory_endpoint.go.tmpl'
   encoder: 'templates/terraform/encoders/service_directory_metadata_to_annotations.go.tmpl'
   decoder: 'templates/terraform/decoders/service_directory_metadata_to_annotations.go.tmpl'
-
+  pre_update: 'templates/terraform/pre_update/service_directory_endpoint.go.tmpl'
 exclude_sweeper: true
 examples:
   - name: 'service_directory_endpoint_basic'
@@ -92,8 +91,6 @@ properties:
       function: 'validation.IntBetween(0, 65535)'
   - name: 'metadata'
     type: KeyValuePairs
-    update_mask_fields:
-      - 'annotations'
     description: |
       Metadata for the endpoint. This data can be consumed
       by service clients. The entire metadata dictionary may contain

mmv1/products/servicedirectory/Service.yaml

@@ -24,7 +24,6 @@ base_url: '{{name}}'
 self_link: '{{name}}'
 create_url: '{{namespace}}/services?serviceId={{service_id}}'
 update_verb: 'PATCH'
-update_mask: true
 import_format:
   - 'projects/{{project}}/locations/{{location}}/namespaces/{{namespace_id}}/services/{{service_id}}'
 timeouts:
@@ -40,6 +39,7 @@ custom_code:
   custom_import: 'templates/terraform/custom_import/service_directory_service.go.tmpl'
   encoder: 'templates/terraform/encoders/service_directory_metadata_to_annotations.go.tmpl'
   decoder: 'templates/terraform/decoders/service_directory_metadata_to_annotations.go.tmpl'
+  pre_update: 'templates/terraform/pre_update/service_directory.go.tmpl'
 
 exclude_sweeper: true
 examples:
@@ -75,8 +75,6 @@ properties:
     output: true
   - name: 'metadata'
     type: KeyValuePairs
-    update_mask_fields:
-      - 'annotations'
     description: |
       Metadata for the service. This data can be consumed
       by service clients. The entire metadata dictionary may contain

mmv1/products/servicedirectory/product.yaml

@@ -17,5 +17,7 @@ display_name: 'Service Directory'
 versions:
   - name: 'ga'
     base_url: 'https://servicedirectory.googleapis.com/v1/'
+  - name: 'beta'
+    base_url: 'https://servicedirectory.googleapis.com/v1beta1/'
 scopes:
   - 'https://www.googleapis.com/auth/cloud-platform'

mmv1/templates/terraform/encoders/service_directory_metadata_to_annotations.go.tmpl

@@ -1,7 +1,9 @@
+{{ if eq $.TargetVersionName "ga" }}
 if obj["metadata"] == nil {
 	return obj, nil
 }
 
 obj["annotations"] = obj["metadata"].(map[string]string)
 delete(obj, "metadata")
+{{ end }}
 return obj, nil

mmv1/templates/terraform/pre_update/service_directory.go.tmpl

@@ -0,0 +1,16 @@
+updateMask := []string{}
+{{ if ne $.TargetVersionName "ga" }}
+if d.HasChange("metadata") {
+  updateMask = append(updateMask, "metadata")
+}
+{{ else}}
+if d.HasChange("metadata") {
+  updateMask = append(updateMask, "annotations")
+}
+{{ end }}
+// updateMask is a URL parameter but not present in the schema, so ReplaceVars
+// won't set it
+url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
+if err != nil {
+  return err
+}

mmv1/templates/terraform/pre_update/service_directory_endpoint.go.tmpl

@@ -0,0 +1,25 @@
+updateMask := []string{}
+
+
+if d.HasChange("address") {
+  updateMask = append(updateMask, "address")
+}
+
+if d.HasChange("port") {
+  updateMask = append(updateMask, "port")
+}
+{{ if ne $.TargetVersionName "ga" }}
+if d.HasChange("metadata") {
+  updateMask = append(updateMask, "metadata")
+}
+{{ else}}
+if d.HasChange("metadata") {
+  updateMask = append(updateMask, "annotations")
+}
+{{ end }}
+// updateMask is a URL parameter but not present in the schema, so ReplaceVars
+// won't set it
+url, err = transport_tpg.AddQueryParams(url, map[string]string{"updateMask": strings.Join(updateMask, ",")})
+if err != nil {
+  return err
+}