From b49011f63c5d56fd05b83797cee0a04c5877b6cb Mon Sep 17 00:00:00 2001 From: badra001 Date: Tue, 2 May 2023 07:10:02 -0400 Subject: [PATCH] update tf-run.data --- .../apps/dns/associate-route53-endpoints.tf | 11 ++++++----- examples/full-setup-tf-upgrade/apps/dns/tf-run.data | 8 ++++---- examples/full-setup-tf-upgrade/apps/tf-run.data | 11 ++++++----- examples/full-setup-tf-upgrade/tf-run.data | 10 +++++----- examples/full-setup-tf-upgrade/tf-run.destroy.data | 6 ++++-- examples/full-setup-tf-upgrade/tgw/tf-run.data | 9 ++++----- .../full-setup-tf-upgrade/vpc-endpoints/tf-run.data | 8 ++++---- 7 files changed, 33 insertions(+), 30 deletions(-) diff --git a/examples/full-setup-tf-upgrade/apps/dns/associate-route53-endpoints.tf b/examples/full-setup-tf-upgrade/apps/dns/associate-route53-endpoints.tf index 1c2542c..2b8b565 100644 --- a/examples/full-setup-tf-upgrade/apps/dns/associate-route53-endpoints.tf +++ b/examples/full-setup-tf-upgrade/apps/dns/associate-route53-endpoints.tf @@ -1,5 +1,7 @@ locals { route53_zone_ids = compact(concat([try(aws_route53_zone.domain_zone[0].zone_id, null)], [for k, v in aws_route53_zone.ptr_zone : v.zone_id])) + # r_zone_ids = { for r in values(var.region_map): r => [for k, v in aws_route53_zone.ptr_zone : v.zone_id if v.vpc.vpc_id!=var.route53_endpoints["route53_main_legacy"][r]] } + # f_zone_ids = { for r in values(var.region_map): r => [ try(aws_route53_zone.domain_zone[0].zone_id if aws_route53_zone.domain_zone[0].vpc.vpc_id!=var.route53_endpoints["route53_main_legacy"][r],null) ] } #--- @@ -23,7 +25,7 @@ module "route53_main_east" { source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade" region = "us-gov-east-1" vpc_id = var.route53_endpoints["route53_main"]["us-gov-east-1"] - zone_ids = local.route53_zone_ids + zone_ids = local.vpc_id != var.route53_endpoints["route53_main"]["us-gov-east-1"] ? local.route53_zone_ids : [] tags = merge( local.common_tags, @@ -40,7 +42,7 @@ module "route53_main_west" { source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade" region = "us-gov-west-1" vpc_id = var.route53_endpoints["route53_main"]["us-gov-west-1"] - zone_ids = local.route53_zone_ids + zone_ids = local.vpc_id != var.route53_endpoints["route53_main"]["us-gov-west-1"] ? local.route53_zone_ids : [] tags = merge( local.common_tags, @@ -69,7 +71,7 @@ module "route53_main_legacy_east" { source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade" region = "us-gov-east-1" vpc_id = var.route53_endpoints["route53_main_legacy"]["us-gov-east-1"] - zone_ids = local.route53_zone_ids + zone_ids = local.vpc_id != var.route53_endpoints["route53_main_legacy"]["us-gov-east-1"] ? local.route53_zone_ids : [] tags = merge( local.common_tags, @@ -86,11 +88,10 @@ module "route53_main_legacy_west" { source = "git@github.e.it.census.gov:terraform-modules/aws-vpc-setup.git//route53-zone-association/zone?ref=tf-upgrade" region = "us-gov-west-1" vpc_id = var.route53_endpoints["route53_main_legacy"]["us-gov-west-1"] - zone_ids = local.route53_zone_ids + zone_ids = local.vpc_id != var.route53_endpoints["route53_main_legacy"]["us-gov-west-1"] ? local.route53_zone_ids : [] tags = merge( local.common_tags, var.application_tags, ) } - diff --git a/examples/full-setup-tf-upgrade/apps/dns/tf-run.data b/examples/full-setup-tf-upgrade/apps/dns/tf-run.data index 6f23e22..25883c5 100644 --- a/examples/full-setup-tf-upgrade/apps/dns/tf-run.data +++ b/examples/full-setup-tf-upgrade/apps/dns/tf-run.data @@ -1,8 +1,10 @@ -VERSION 1.1.6 +VERSION 1.1.7 REMOTE-STATE COMMAND tf-directory-setup.py -l none -f COMMAND setup-new-directory.sh -COMMAND tf-init -upgrade +LINK variables.vpc.auto.tfvars +LINK variables.vpc.tf +COMMAND tf-init LINKTOP includes.d/variables.account_tags.tf LINKTOP includes.d/variables.account_tags.auto.tfvars @@ -11,8 +13,6 @@ LINKTOP includes.d/variables.infrastructure_tags.auto.tfvars LINKTOP includes.d/variables.application_tags.tf LINKTOP includes.d/variables.application_tags.auto.tfvars -LINK variables.vpc.tf -LINK variables.vpc.auto.tfvars aws_route53_zone.domain_zone aws_route53_zone.ptr_zone aws_route53_resolver_rule_association.all_rules diff --git a/examples/full-setup-tf-upgrade/apps/tf-run.data b/examples/full-setup-tf-upgrade/apps/tf-run.data index 9a46c7d..ff4775d 100644 --- a/examples/full-setup-tf-upgrade/apps/tf-run.data +++ b/examples/full-setup-tf-upgrade/apps/tf-run.data @@ -1,12 +1,13 @@ -VERSION 1.0.4 +VERSION 1.0.5 REMOTE-STATE COMMAND tf-directory-setup.py -l none -f COMMAND setup-new-directory.sh -COMMAND tf-init -upgrade -COMMAND ln -sf ../variables.vpc.auto.tfvars . -COMMAND ln -sf ../variables.vpc.tf . - COMMAND rm provider.infoblox.* +LINK variables.vpc.auto.tfvars +LINK variables.vpc.tf + +COMMAND tf-init + # LINKTOP provider_configs.d/provider.infoblox.auto.tfvars # LINKTOP provider_configs.d/provider.infoblox.tf # LINKTOP provider_configs.d/provider.infoblox.variables.tf diff --git a/examples/full-setup-tf-upgrade/tf-run.data b/examples/full-setup-tf-upgrade/tf-run.data index a20207b..203d4c6 100644 --- a/examples/full-setup-tf-upgrade/tf-run.data +++ b/examples/full-setup-tf-upgrade/tf-run.data @@ -1,8 +1,11 @@ -VERSION 1.2.2 +VERSION 1.2.3 REMOTE-STATE COMMAND tf-directory-setup.py -l none -f COMMAND setup-new-directory.sh -COMMAND tf-init -upgrade +LINKTOP provider_configs.d/provider.infoblox.auto.tfvars +LINKTOP provider_configs.d/provider.infoblox.tf +LINKTOP provider_configs.d/provider.infoblox.variables.tf +COMMAND tf-init LINKTOP includes.d/variables.account_tags.tf LINKTOP includes.d/variables.account_tags.auto.tfvars @@ -11,9 +14,6 @@ LINKTOP includes.d/variables.infrastructure_tags.auto.tfvars LINKTOP includes.d/variables.application_tags.tf ## LINKTOP includes.d/variables.application_tags.auto.tfvars -LINKTOP provider_configs.d/provider.infoblox.auto.tfvars -LINKTOP provider_configs.d/provider.infoblox.tf -LINKTOP provider_configs.d/provider.infoblox.variables.tf LINKTOP common/remote_state.common.tf LINKTOP infrastructure/%%SHORT_REGION%%/remote_state.infrastructure_%%SHORT_REGION%%.tf diff --git a/examples/full-setup-tf-upgrade/tf-run.destroy.data b/examples/full-setup-tf-upgrade/tf-run.destroy.data index 3446e9a..e98c40b 100644 --- a/examples/full-setup-tf-upgrade/tf-run.destroy.data +++ b/examples/full-setup-tf-upgrade/tf-run.destroy.data @@ -1,8 +1,9 @@ -VERSION 1.0.2 +VERSION 1.0.4 BACKUP-STATE COMMAND tf-init COMMAND tf-state list +module.vpn_transit_gateway infoblox_ipv4_network_container.vpc_private infoblox_ipv4_network_container.vpc module.peer_services_main_west module.peer_services_main_east @@ -12,5 +13,6 @@ module.base-security-groups module.flowlogs module.vpn module.routing -module.vpc module.subnets +module.subnets +module.vpc ALL diff --git a/examples/full-setup-tf-upgrade/tgw/tf-run.data b/examples/full-setup-tf-upgrade/tgw/tf-run.data index 5e76e54..03af1ec 100644 --- a/examples/full-setup-tf-upgrade/tgw/tf-run.data +++ b/examples/full-setup-tf-upgrade/tgw/tf-run.data @@ -1,11 +1,10 @@ -VERSION 1.0.3 +VERSION 1.0.4 REMOTE-STATE COMMAND tf-directory-setup.py -l none -f COMMAND setup-new-directory.sh -COMMAND tf-init -upgrade -COMMAND ln -sf ../variables.vpc.auto.tfvars -COMMAND ln -sf ../variables.vpc.tf -## COMMAND ln -sf ../variables.tf +LINK variables.vpc.auto.tfvars +LINK variables.vpc.tf +COMMAND tf-init ALL COMMAND tf-directory-setup.py -l s3 diff --git a/examples/full-setup-tf-upgrade/vpc-endpoints/tf-run.data b/examples/full-setup-tf-upgrade/vpc-endpoints/tf-run.data index c8df7a2..c74219e 100644 --- a/examples/full-setup-tf-upgrade/vpc-endpoints/tf-run.data +++ b/examples/full-setup-tf-upgrade/vpc-endpoints/tf-run.data @@ -1,8 +1,10 @@ -VERSION 1.0.2 +VERSION 1.0.3 REMOTE-STATE COMMAND tf-directory-setup.py -l none -f COMMAND setup-new-directory.sh -COMMAND tf-init -upgrade +LINK variables.vpc.tf +LINK variables.vpc.auto.tfvars +COMMAND tf-init LINKTOP includes.d/variables.account_tags.tf LINKTOP includes.d/variables.account_tags.auto.tfvars @@ -10,8 +12,6 @@ LINKTOP includes.d/variables.infrastructure_tags.tf LINKTOP includes.d/variables.infrastructure_tags.auto.tfvars LINKTOP includes.d/variables.application_tags.tf LINKTOP includes.d/variables.application_tags.auto.tfvars -LINK variables.vpc.tf -LINK variables.vpc.auto.tfvars ALL COMMAND tf-directory-setup.py -l s3