From 3d17735717a76f6bf8f3ab011b13d88d9cd48e2f Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Thu, 24 Oct 2019 15:57:52 -0700 Subject: [PATCH 1/2] If certificate_id is unset, it should not cause a diff. --- products/appengine/terraform.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/products/appengine/terraform.yaml b/products/appengine/terraform.yaml index 8d1e56f63a6e..829d31ed1ae8 100644 --- a/products/appengine/terraform.yaml +++ b/products/appengine/terraform.yaml @@ -93,6 +93,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides update_mask_fields: - "ssl_settings.certificate_id" - "ssl_settings.ssl_management_type" + sslSettings.certificateId: !ruby/object:Overrides::Terraform::PropertyOverride + default_from_api: true ApplicationUrlDispatchRules: !ruby/object:Overrides::Terraform::ResourceOverride id_format: "{{project}}" import_format: ["{{project}}"] From 3e80c2c37a89cae113bd01facee073d6f4ee070d Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Fri, 25 Oct 2019 20:23:42 +0000 Subject: [PATCH 2/2] Update tracked submodules -> HEAD on Fri Oct 25 20:23:42 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/terraform | 2 +- build/terraform-beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/terraform b/build/terraform index b28342443e78..77891f3dde32 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit b28342443e78709c362d893bda09c28e45938116 +Subproject commit 77891f3dde3268522b443eea3e58e603eb63942b diff --git a/build/terraform-beta b/build/terraform-beta index 379f53be9fb5..01c066a89e27 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 379f53be9fb5a0c68cac127910147d6215a40ca5 +Subproject commit 01c066a89e277b5590e7c6d30b00f31736bb88ac