Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't require 'trigger_template' since it conflicts with 'github' in beta. #2717

Merged
merged 3 commits into from
Nov 19, 2019
Merged

Don't require 'trigger_template' since it conflicts with 'github' in beta. #2717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b938bbb
Don't require 'trigger_template' since it conflicts with 'github' in …
nat-henderson Nov 19, 2019
9511344
docs update to indicate one is required.
nat-henderson Nov 19, 2019
6ccf91c
Update tracked submodules -> HEAD on Tue Nov 19 20:27:27 UTC 2019
modular-magician Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/ansible
Open in desktop
Submodule ansible updated from 04b5f5 to a80f84
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from 4bfacd to b6a7cc
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from 09ea27 to 6618e7
4 changes: 3 additions & 1 deletion products/cloudbuild/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ 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'
Expand Down Expand Up @@ -165,6 +164,9 @@ objects:
description: |
Describes the configuration of a trigger that creates a build whenever a GitHub event is received.
min_version: beta
exactly_one_of:
- trigger_template
- github
properties:
- !ruby/object:Api::Type::String
name: 'owner'
Expand Down
8 changes: 8 additions & 0 deletions products/cloudbuild/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ overrides: !ruby/object:Overrides::ResourceOverrides
default_from_api: true
build.steps: !ruby/object:Overrides::Terraform::PropertyOverride
name: 'step'
triggerTemplate: !ruby/object:Overrides::Terraform::PropertyOverride
description: |
{{description}}
One of `trigger_template` or `github` must be provided.
github: !ruby/object:Overrides::Terraform::PropertyOverride
description: |
{{description}}
One of `trigger_template` or `github` must be provided.
triggerTemplate.projectId: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
custom_code: !ruby/object:Provider::Terraform::CustomCode
Expand Down