From e421856d10c1128eb774b51bed90a768b53fcc5a Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 24 Nov 2023 16:24:24 +0000 Subject: [PATCH] Bump terraform-dxw-dalmatian-infrastructure module to v0.6.0 * https://github.com/dxw/terraform-dxw-dalmatian-infrastructure/releases/tag/v0.6.0 * Adds the tfvar defaults for infrastructure deployments --- bin/dalmatian | 2 +- data/tfvars-templates/infrastructure.tfvars | 38 +++++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/bin/dalmatian b/bin/dalmatian index c7fa45b..2a7975a 100755 --- a/bin/dalmatian +++ b/bin/dalmatian @@ -177,7 +177,7 @@ then export GIT_DALMATIAN_INFRASTRUCTURE_REPO="terraform-dxw-dalmatian-infrastructure" export TERRAFORM_PROJECT_ACCOUNT_BOOTSTRAP_VERSION="v0.5.0" - export TERRAFORM_PROJECT_INFRASTRUCTURE_VERSION="v0.5.0" + export TERRAFORM_PROJECT_INFRASTRUCTURE_VERSION="v0.6.0" export AWS_CONFIG_FILE="$CONFIG_AWS_SSO_FILE" export AWS_PROFILE="dalmatian-main" diff --git a/data/tfvars-templates/infrastructure.tfvars b/data/tfvars-templates/infrastructure.tfvars index 94ae95f..af36dee 100644 --- a/data/tfvars-templates/infrastructure.tfvars +++ b/data/tfvars-templates/infrastructure.tfvars @@ -3,18 +3,26 @@ infrastructure_kms_encryption = false infrastructure_logging_bucket_retention = 30 # Infrastructure VPC -infrastructure_vpc = false -infrastructure_vpc_cidr_block = "10.0.0.0/16" -infrastructure_vpc_enable_dns_support = false -infrastructure_vpc_enable_dns_hostnames = false -infrastructure_vpc_instance_tenancy = "default" -infrastructure_vpc_enable_network_address_usage_metrics = false -infrastructure_vpc_assign_generated_ipv6_cidr_block = false -infrastructure_vpc_network_enable_public = false -infrastructure_vpc_network_enable_private = false -infrastructure_vpc_network_availability_zones = ["a", "b", "c"] -infrastructure_vpc_flow_logs_cloudwatch_logs = false -infrastructure_vpc_flow_logs_retention = 30 -infrastructure_vpc_flow_logs_s3_with_athena = false -infrastructure_vpc_flow_logs_s3_key_prefix = "infrastructure-vpc-flow-logs" -infrastructure_vpc_flow_logs_traffic_type = "ALL" +infrastructure_vpc = false +infrastructure_vpc_cidr_block = "10.0.0.0/16" +infrastructure_vpc_enable_dns_support = false +infrastructure_vpc_enable_dns_hostnames = false +infrastructure_vpc_instance_tenancy = "default" +infrastructure_vpc_enable_network_address_usage_metrics = false +infrastructure_vpc_assign_generated_ipv6_cidr_block = false +infrastructure_vpc_network_enable_public = false +infrastructure_vpc_network_enable_private = false +infrastructure_vpc_network_availability_zones = ["a", "b", "c"] +infrastructure_vpc_flow_logs_cloudwatch_logs = false +infrastructure_vpc_flow_logs_retention = 30 +infrastructure_vpc_flow_logs_s3_with_athena = false +infrastructure_vpc_flow_logs_s3_key_prefix = "infrastructure-vpc-flow-logs" +infrastructure_vpc_flow_logs_traffic_type = "ALL" +infrastructure_vpc_network_acl_egress_lockdown_public = false +infrastructure_vpc_network_acl_egress_lockdown_private = false +infrastructure_vpc_network_acl_ingress_lockdown_public = false +infrastructure_vpc_network_acl_ingress_lockdown_private = false +infrastructure_vpc_network_acl_egress_custom_rules_public = [] +infrastructure_vpc_network_acl_egress_custom_rules_private = [] +infrastructure_vpc_network_acl_ingress_custom_rules_public = [] +infrastructure_vpc_network_acl_ingress_custom_rules_private = []