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

Add "inbound_services" to google_app_engine_standard_app_version #3537

Merged
merged 4 commits into from
Jun 2, 2020
Merged

Add "inbound_services" to google_app_engine_standard_app_version #3537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbf61b2
Add "inbound_services" to google_app_engine_standard_app_version
pmarschik May 19, 2020
9cf17a0
add test case for google_app_engine_standard_app_version.inbound_serv…
pmarschik May 22, 2020
ee24920
make inboundServices a terraform set in google_app_engine_standard_ap…
pmarschik May 29, 2020
67aa69b
extend test case for app_engine_standard_app_version to set multiple …
pmarschik May 29, 2020
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
5 changes: 5 additions & 0 deletions products/appengine/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,11 @@ objects:
required: true
description: |
The format should be a shell command that can be fed to bash -c.
- !ruby/object:Api::Type::Array
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend making this a set instead (is_set: true in terraform.yaml) because the order these are specified in shouldn't matter.

name: 'inboundServices'
description: |
Before an application can receive email or XMPP messages, the application must be configured to enable the service.
item_type: Api::Type::String
- !ruby/object:Api::Type::String
name: 'instanceClass'
description: |
Expand Down
4 changes: 4 additions & 0 deletions products/appengine/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
# instanceClass defaults to a value based on the scaling method
instanceClass: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
inboundServices: !ruby/object:Overrides::Terraform::PropertyOverride
is_set: true
examples:
- !ruby/object:Provider::Terraform::Examples
name: "app_engine_standard_app_version"
Expand Down Expand Up @@ -127,6 +129,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
default_from_api: true
handlers: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
inboundServices: !ruby/object:Overrides::Terraform::PropertyOverride
is_set: true
examples:
- !ruby/object:Provider::Terraform::Examples
name: "app_engine_flexible_app_version"
Expand Down
4 changes: 4 additions & 0 deletions third_party/terraform/tests/resource_app_engine_standard_app_version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ resource "google_app_engine_standard_app_version" "foo" {
}
}

inbound_services = ["INBOUND_SERVICE_WARMUP", "INBOUND_SERVICE_MAIL"]

env_variables = {
port = "8000"
}
Expand Down Expand Up @@ -168,6 +170,8 @@ resource "google_app_engine_standard_app_version" "foo" {
}
}

inbound_services = []

env_variables = {
port = "8000"
}
Expand Down