Change CR Domain Mapping route name to string (#2889)

Merged PR #2889.
GoogleCloudPlatform · Dec 27, 2019 · 8fd7212 · 8fd7212
1 parent fb78675
commit 8fd7212
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/build/terraform-mapper b/build/terraform-mapper
diff --git a/products/cloudrun/api.yaml b/products/cloudrun/api.yaml
@@ -135,10 +135,8 @@ objects:
         It is recommended that the user leaves this empty to receive an error
         warning about a potential conflict and only set it once the respective UI
         has given such a warning.
-    - !ruby/object:Api::Type::ResourceRef
+    - !ruby/object:Api::Type::String
       name: routeName
-      resource: Service
-      imports: name
       required: true
       description: |-
         The name of the Cloud Run Service that this DomainMapping applies to.

diff --git a/products/cloudrun/terraform.yaml b/products/cloudrun/terraform.yaml
@@ -46,6 +46,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         custom_flatten: templates/terraform/custom_flatten/set_to_project.go.erb
       metadata.name: !ruby/object:Overrides::Terraform::PropertyOverride
         exclude: true
+      spec.routeName: !ruby/object:Overrides::Terraform::PropertyOverride
+        custom_expand: 'templates/terraform/custom_expand/resource_from_self_link.go.erb'
+        diff_suppress_func: 'compareSelfLinkOrResourceName'
   Service: !ruby/object:Overrides::Terraform::ResourceOverride
     id_format: "locations/{{location}}/namespaces/{{project}}/services/{{name}}"
     import_format: ["locations/{{location}}/namespaces/{{project}}/services/{{name}}"]