From c0e315e47620341ac9dff5ca3bea3dd3bd036243 Mon Sep 17 00:00:00 2001 From: Nathan McKinley Date: Tue, 24 Sep 2019 14:34:47 -0700 Subject: [PATCH] cloudbuild build trigger's trigger template should be required in 3.0.0. (#2352) * cloudbuild build trigger's trigger template should be required in 3.0.0. --- products/cloudbuild/api.yaml | 1 + products/cloudbuild/terraform.yaml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/products/cloudbuild/api.yaml b/products/cloudbuild/api.yaml index 5c9da4efebd5..457ef7bfd338 100644 --- a/products/cloudbuild/api.yaml +++ b/products/cloudbuild/api.yaml @@ -101,6 +101,7 @@ objects: Branch and tag names in trigger templates are interpreted as regular expressions. Any branch or tag change that matches that regular expression will trigger a build. + required: true properties: - !ruby/object:Api::Type::String name: 'projectId' diff --git a/products/cloudbuild/terraform.yaml b/products/cloudbuild/terraform.yaml index 5503ae1c45eb..132d5a7ee1f5 100644 --- a/products/cloudbuild/terraform.yaml +++ b/products/cloudbuild/terraform.yaml @@ -28,9 +28,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides name: 'trigger_id' build.steps: !ruby/object:Overrides::Terraform::PropertyOverride name: 'step' - triggerTemplate: !ruby/object:Overrides::Terraform::PropertyOverride - description: | - {{description}}This field is required, and will be validated as such in 3.0.0. triggerTemplate.projectId: !ruby/object:Overrides::Terraform::PropertyOverride default_from_api: true custom_code: !ruby/object:Provider::Terraform::CustomCode