From 2404f2e0025bffb265f5576a28d599a7e31a61be Mon Sep 17 00:00:00 2001 From: badra001 Date: Fri, 24 Feb 2023 12:38:07 -0500 Subject: [PATCH] update changelog, defaults, version --- CHANGELOG.md | 4 ++++ common/defaults.tf | 13 +++++++++++++ common/version.tf | 5 +++-- examples/full-setup-tf-upgrade/infoblox.tf.off | 18 +++++++++--------- examples/full-setup-tf-upgrade/tgw/tf-run.data | 3 ++- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65974e1..cd87c4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -252,3 +252,7 @@ - add prefix-list associations for peering routes (if create_prefix_list_routing) - add static routes (if create_static_peer_routing) - create vpn route conditional (if enable_vpn_routing) + +* 2.6.0 -- 2023-02-24 + - share-resources: new submodule + diff --git a/common/defaults.tf b/common/defaults.tf index 263025b..34a7a6b 100644 --- a/common/defaults.tf +++ b/common/defaults.tf @@ -51,5 +51,18 @@ locals { "force_detach_policies" = false "max_session_duration" = 3600 } + #--- + # organization master defaults + #--- + "organization_master" = { + "aws" = { + account_profile = "109223337795-censusaws" + region = "us-east-1" + } + "aws-us-gov" = { + account_profile = "252903981224-ma5-gov" + region = "us-gov-west-1" + } + } } } diff --git a/common/version.tf b/common/version.tf index 505e8fa..e83ace3 100644 --- a/common/version.tf +++ b/common/version.tf @@ -1,5 +1,5 @@ locals { - _module_version = "2.5.0" + _module_version = "2.6.0" _module_names = { "_main_" = "aws-vpc-setup" @@ -11,8 +11,9 @@ locals { "peer" = "aws-vpc-setup/peer" "routing" = "aws-vpc-setup/routing" "security-groups" = "aws-vpc-setup/security-groups" - "subnets" = "aws-vpc-setup/subnets" "tag-shared-vpc-resources" = "aws-vpc-setup/tag-shared-vpc-resources" + "share-resources" = "aws-vpc-setup/share-resources" + "subnets" = "aws-vpc-setup/subnets" "vpc" = "aws-vpc-setup/vpc" "vpc-interface-endpoint" = "aws-vpc-setup/vpc-interface-endpoint" "vpn" = "aws-vpc-setup/vpn" diff --git a/examples/full-setup-tf-upgrade/infoblox.tf.off b/examples/full-setup-tf-upgrade/infoblox.tf.off index 6dd495a..a2f1343 100644 --- a/examples/full-setup-tf-upgrade/infoblox.tf.off +++ b/examples/full-setup-tf-upgrade/infoblox.tf.off @@ -1,33 +1,33 @@ resource "infoblox_ipv4_network_container" "vpc" { network_view = "default" cidr = var.vpc_cidr_block - comment = format("%v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name) + comment = format("%v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name) } resource "infoblox_ipv4_network_container" "vpc_public" { - for_each = { for sn in var.public_subnets: sn.label => sn } + for_each = { for sn in var.public_subnets : sn.label => sn if sn.offset==0} network_view = "default" cidr = each.value.base_cidr - comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name,each.value.label) + comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label) } resource "infoblox_ipv4_network_container" "vpc_private" { - for_each = { for sn in var.private_subnets: sn.label => sn } + for_each = { for sn in var.private_subnets : sn.label => sn if sn.offset==0} network_view = "default" cidr = each.value.base_cidr - comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name,each.value.label) + comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label) } resource "infoblox_ipv4_network" "vpc_public_subnets" { - for_each = { for sn in module.subnets.public_subnets_ids: sn.subnet => sn } + for_each = { for sn in module.subnets.public_subnets_ids : sn.subnet => sn } network_view = "default" cidr = each.value.subnet - comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name,each.value.label) + comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label) } resource "infoblox_ipv4_network" "vpc_private_subnets" { - for_each = { for sn in module.subnets.private_subnets_ids: sn.subnet => sn } + for_each = { for sn in module.subnets.private_subnets_ids : sn.subnet => sn } network_view = "default" cidr = each.value.subnet - comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, var.vpc_full_name,each.value.label) + comment = format("%v %v %v %v %v", "AWS", var.account_alias, local.region, local.vpc_full_name, each.value.label) } diff --git a/examples/full-setup-tf-upgrade/tgw/tf-run.data b/examples/full-setup-tf-upgrade/tgw/tf-run.data index b7b5dbb..5e76e54 100644 --- a/examples/full-setup-tf-upgrade/tgw/tf-run.data +++ b/examples/full-setup-tf-upgrade/tgw/tf-run.data @@ -1,10 +1,11 @@ -VERSION 1.0.1 +VERSION 1.0.3 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 ALL COMMAND tf-directory-setup.py -l s3