Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 templates/terraform/environments/production/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module "production" {

# Hosting configuration
s3_hosting_buckets = [
"<% index .Params `productionFrontendHost` %>"
"<% index .Params `productionFrontendSubdomain` %><% index .Params `productionHostRoot` %>"
]
domain_name = "<% index .Params `productionHostRoot` %>"

Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/environments/staging/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module "staging" {

# Hosting configuration
s3_hosting_buckets = [
"<% index .Params `stagingFrontendHost` %>",
"<% index .Params `stagingFrontendSubdomain` %><% index .Params `stagingHostRoot` %>",
]
domain_name = "<% index .Params `stagingHostRoot` %>"

Expand Down
20 changes: 12 additions & 8 deletions zero-module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,20 @@ parameters:
- "us-east-2"
- field: productionHostRoot
label: Production Root Host Name (e.g. mydomain.com) - this must be the root of the chosen domain, not a subdomain.
- field: productionFrontendHost
label: Production Frontend Host Name (e.g. app.mydomain.com)
- field: productionBackendHost
label: Production Backend Host Name (e.g. api.mydomain.com)
- field: productionFrontendSubdomain
label: Production Frontend Host Name (e.g. app.)
default: app.
- field: productionBackendSubdomain
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If we don't use these backend domains we should probably remove them.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this would make the prompt order more confusing though, it would

loads then prompts eks stack
productionHostRoot
productionFrontendSubdomain
stagingHostRoot
stagingFrontendSubdomain
loads then prompts deployable backend
productionBackendSubdomain
stagingBackendSubdomain

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, that's annoying, though we'll have to deal with it eventually.. You can leave it for now I guess.

label: Production Backend Host Name (e.g. api.)
default: api.
- field: stagingHostRoot
label: Staging Root Host Name (e.g. mydomain-staging.com) - this must be the root of the chosen domain, not a subdomain.
- field: stagingFrontendHost
label: Staging Frontend Host Name (e.g. app.mydomain-staging.com)
- field: stagingBackendHost
label: Staging Backend Host Name (e.g. api.mydomain-staging.com)
- field: stagingFrontendSubdomain
label: Staging Frontend Host Name (e.g. app.)
default: app.
- field: stagingBackendSubdomain
label: Staging Backend Host Name (e.g. api.)
default: api.
- field: accountId
label: AWS Account ID
execute: aws sts get-caller-identity --query "Account" | tr -d '"'
Expand Down