Skip to content

Commit

Permalink
Add Route53 Hosted Zone variables
Browse files Browse the repository at this point in the history
* This adds the default variables required for the Route53 features in
  both the account bootstrap and infrastructure projects.
* By default, nothing will be created.
* Bumps the modules to the required version
  • Loading branch information
Stretch96 committed Dec 6, 2023
1 parent f5c49ed commit 9cbd707
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bin/dalmatian
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ then
export GIT_DALMATIAN_INFRASTRUCTURE_OWNER="dxw"
export GIT_DALMATIAN_INFRASTRUCTURE_REPO="terraform-dxw-dalmatian-infrastructure"

export TERRAFORM_PROJECT_ACCOUNT_BOOTSTRAP_VERSION="v0.5.0"
export TERRAFORM_PROJECT_INFRASTRUCTURE_VERSION="v0.6.0"
export TERRAFORM_PROJECT_ACCOUNT_BOOTSTRAP_VERSION="v0.6.0"
export TERRAFORM_PROJECT_INFRASTRUCTURE_VERSION="v0.7.0"

export AWS_CONFIG_FILE="$CONFIG_AWS_SSO_FILE"
export AWS_PROFILE="dalmatian-main"
Expand Down
3 changes: 3 additions & 0 deletions bin/terraform-dependencies/run-terraform-command
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,15 @@ then
then
TF_VAR_enable_s3_tfvars=true
TF_VAR_tfvars_s3_tfvars_files="$(cat "$CONFIG_TFVARS_PATHS_FILE")"
TF_VAR_enable_route53_root_hosted_zone=true
else
TF_VAR_enable_s3_tfvars=false
TF_VAR_tfvars_s3_tfvars_files="{}"
TF_VAR_enable_route53_root_hosted_zone=false
fi
export TF_VAR_enable_s3_tfvars
export TF_VAR_tfvars_s3_tfvars_files
export TF_VAR_enable_route53_root_hosted_zone
export AWS_PROFILE="$ACCOUNT_NAME"
OPTIONS+=("-var-file=$CONFIG_TFVARS_DEFAULT_ACCOUNT_BOOTSRAP_FILE")
OPTIONS+=("-var-file=$CONFIG_TFVARS_DIR/$CONFIG_GLOBAL_ACCOUNT_BOOSTRAP_TFVARS_FILE")
Expand Down
3 changes: 3 additions & 0 deletions data/tfvars-templates/account-bootstrap.tfvars
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Logging
logging_bucket_retention = 30

# Route53
route53_root_hosted_zone_domain_name = ""

# Cloudtrail
enable_cloudtrail = true
cloudtrail_log_retention = 30
Expand Down
5 changes: 5 additions & 0 deletions data/tfvars-templates/infrastructure.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
infrastructure_kms_encryption = false
infrastructure_logging_bucket_retention = 30

# Route53
route53_root_hosted_zone_domain_name = ""
aws_profile_name_route53_root = "dalmatian-main"
enable_infrastructure_route53_hosted_zone = false

# Infrastructure VPC
infrastructure_vpc = false
infrastructure_vpc_cidr_block = "10.0.0.0/16"
Expand Down

0 comments on commit 9cbd707

Please sign in to comment.