From 8fd721257038d7d31d1c60f5cf0cc78c36dde968 Mon Sep 17 00:00:00 2001 From: emily Date: Fri, 27 Dec 2019 11:39:39 -0800 Subject: [PATCH] Change CR Domain Mapping route name to string (#2889) Merged PR #2889. --- build/terraform | 2 +- build/terraform-beta | 2 +- build/terraform-mapper | 2 +- products/cloudrun/api.yaml | 4 +--- products/cloudrun/terraform.yaml | 3 +++ 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build/terraform b/build/terraform index 2cadbaba8733..45b9027de41c 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 2cadbaba87335868667733a813ee431827c5bb1e +Subproject commit 45b9027de41c63d3a2bc29b8c2809e15b122357c diff --git a/build/terraform-beta b/build/terraform-beta index 906fe916ff58..2fda896002e1 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 906fe916ff582a9d0a30aa96a260174f56c017cc +Subproject commit 2fda896002e16dd4bd5af887d60526cd1f22a08e diff --git a/build/terraform-mapper b/build/terraform-mapper index d990090e2dfa..a6e2bd9b5896 160000 --- a/build/terraform-mapper +++ b/build/terraform-mapper @@ -1 +1 @@ -Subproject commit d990090e2dfaace014fc19831f86d3a81483b7c2 +Subproject commit a6e2bd9b5896c85b78c321a08b82a0225f7a5b6c diff --git a/products/cloudrun/api.yaml b/products/cloudrun/api.yaml index 9c7e34075cd4..50fc05a1fe59 100644 --- 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 index 2a9842322fce..fb572db6e086 100644 --- 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}}"]