From 1fc960c5d0acd73327cf855836bb66ba166d02a9 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 10:54:09 +0200 Subject: [PATCH 01/12] Fix subnet creation --- locals.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locals.tf b/locals.tf index 6573bea..e058b4f 100644 --- a/locals.tf +++ b/locals.tf @@ -91,11 +91,11 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) - additional_sn_private_a = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) - additional_sn_private_b = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) - additional_sn_private_c = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) - additional_sn_public_a = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) - additional_sn_public_b = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) - additional_sn_public_c = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) + additional_sn_private_a = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) : 0) + additional_sn_private_b = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) : 0) + additional_sn_private_c = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) : 0) + additional_sn_public_a = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) : 0) + additional_sn_public_b = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) : 0) + additional_sn_public_c = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) : 0) } From 36a75ea050611ce9d27816a4917e06630c4aaffd Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 11:59:06 +0200 Subject: [PATCH 02/12] Dynamic subnet check --- cidr.tf | 12 ++++++------ locals.tf | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/cidr.tf b/cidr.tf index d6c9153..30b8bbc 100644 --- a/cidr.tf +++ b/cidr.tf @@ -9,7 +9,7 @@ resource "aws_vpc_ipv4_cidr_block_association" "additional_cidr" { resource "aws_subnet" "additional_sn_private_a" { count = local.additional_sn_private_a vpc_id = aws_vpc.main.id - cidr_block = (local.enable_dynamic_subnets == true ? var.additional_private_subnets_a[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 0)) + cidr_block = (local.enable_additional_dynamic_subnets == true ? var.additional_private_subnets_a[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 0)) availability_zone = local.az1 tags = merge( @@ -25,7 +25,7 @@ resource "aws_subnet" "additional_sn_private_a" { resource "aws_subnet" "additional_sn_private_b" { count = local.additional_sn_private_b vpc_id = aws_vpc.main.id - cidr_block = (local.enable_dynamic_subnets == true ? var.additional_private_subnets_b[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 1)) + cidr_block = (local.enable_additional_dynamic_subnets == true ? var.additional_private_subnets_b[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 1)) availability_zone = local.az2 tags = merge( @@ -41,7 +41,7 @@ resource "aws_subnet" "additional_sn_private_b" { resource "aws_subnet" "additional_sn_private_c" { count = local.additional_sn_private_c vpc_id = aws_vpc.main.id - cidr_block = (local.enable_dynamic_subnets == true ? var.additional_private_subnets_c[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 2)) + cidr_block = (local.enable_additional_dynamic_subnets == true ? var.additional_private_subnets_c[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 2)) availability_zone = local.az3 tags = merge( @@ -59,7 +59,7 @@ resource "aws_subnet" "additional_sn_private_c" { resource "aws_subnet" "additional_sn_public_a" { count = local.additional_sn_public_a vpc_id = aws_vpc.main.id - cidr_block = (local.enable_dynamic_subnets == true ? var.additional_public_subnets_a[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 4)) + cidr_block = (local.enable_additional_dynamic_subnets == true ? var.additional_public_subnets_a[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 4)) availability_zone = local.az1 tags = merge( @@ -76,7 +76,7 @@ resource "aws_subnet" "additional_sn_public_a" { resource "aws_subnet" "additional_sn_public_b" { count = local.additional_sn_public_b vpc_id = aws_vpc.main.id - cidr_block = (local.enable_dynamic_subnets == true ? var.additional_public_subnets_b[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 5)) + cidr_block = (local.enable_additional_dynamic_subnets == true ? var.additional_public_subnets_b[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 5)) availability_zone = local.az2 tags = merge( @@ -93,7 +93,7 @@ resource "aws_subnet" "additional_sn_public_b" { resource "aws_subnet" "additional_sn_public_c" { count = local.additional_sn_public_c vpc_id = aws_vpc.main.id - cidr_block = (local.enable_dynamic_subnets == true ? var.additional_public_subnets_c[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 6)) + cidr_block = (local.enable_additional_dynamic_subnets == true ? var.additional_public_subnets_c[count.index] : cidrsubnet(var.vpc_additional_cidr[count.index], 3, 6)) availability_zone = local.az3 tags = merge( diff --git a/locals.tf b/locals.tf index e058b4f..abf2e19 100644 --- a/locals.tf +++ b/locals.tf @@ -91,11 +91,12 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) - additional_sn_private_a = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) : 0) - additional_sn_private_b = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) : 0) - additional_sn_private_c = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) : 0) - additional_sn_public_a = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) : 0) - additional_sn_public_b = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) : 0) - additional_sn_public_c = (enable_additional_cidr == true ? (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) : 0) + enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) + additional_sn_private_a = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) + additional_sn_private_b = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) + additional_sn_private_c = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) + additional_sn_public_a = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) + additional_sn_public_b = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) + additional_sn_public_c = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) } From 51e9366a35523842543ccf0149babf53a21e1382 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 13:20:23 +0200 Subject: [PATCH 03/12] Fix variable --- locals.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locals.tf b/locals.tf index abf2e19..dc9069d 100644 --- a/locals.tf +++ b/locals.tf @@ -92,11 +92,11 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) - additional_sn_private_a = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) - additional_sn_private_b = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) - additional_sn_private_c = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) - additional_sn_public_a = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) - additional_sn_public_b = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) - additional_sn_public_c = (local.enable_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) + additional_sn_private_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) + additional_sn_private_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) + additional_sn_private_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) + additional_sn_public_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) + additional_sn_public_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) + additional_sn_public_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) } From d588d18c1cd9ab51d9524be01520791595a1a2cf Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 13:30:35 +0200 Subject: [PATCH 04/12] test prv a --- locals.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locals.tf b/locals.tf index dc9069d..93989f9 100644 --- a/locals.tf +++ b/locals.tf @@ -92,7 +92,7 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) - additional_sn_private_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) + additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) : 0) additional_sn_private_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) additional_sn_private_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) additional_sn_public_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) From 7c55b8833973c86c61295501789a53d802fe5416 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 13:35:45 +0200 Subject: [PATCH 05/12] update prv a check --- locals.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locals.tf b/locals.tf index 93989f9..c4399d4 100644 --- a/locals.tf +++ b/locals.tf @@ -92,7 +92,7 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) - additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) : 0) + additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? 1 : 0) additional_sn_private_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) additional_sn_private_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) additional_sn_public_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) From c084e8494827b92c5b75a0152762f715891e976c Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 13:42:07 +0200 Subject: [PATCH 06/12] prv a 0 --- locals.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locals.tf b/locals.tf index c4399d4..b730c8d 100644 --- a/locals.tf +++ b/locals.tf @@ -92,7 +92,7 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) - additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? 1 : 0) + additional_sn_private_a = 0 additional_sn_private_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) additional_sn_private_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) additional_sn_public_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) From 29b0bccad2871adb9071644d645a92ebc2b5d7e2 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 13:52:17 +0200 Subject: [PATCH 07/12] test condition prv a --- locals.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locals.tf b/locals.tf index b730c8d..c4399d4 100644 --- a/locals.tf +++ b/locals.tf @@ -92,7 +92,7 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) - additional_sn_private_a = 0 + additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? 1 : 0) additional_sn_private_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) additional_sn_private_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) additional_sn_public_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) From aab3bab9ceea173930d17300f72d5ebf0831f819 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 13:57:21 +0200 Subject: [PATCH 08/12] test prv abc --- locals.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locals.tf b/locals.tf index c4399d4..1519f6d 100644 --- a/locals.tf +++ b/locals.tf @@ -93,8 +93,8 @@ locals { enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? 1 : 0) - additional_sn_private_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) - additional_sn_private_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) + additional_sn_private_b = (length(var.vpc_additional_cidr) > 0 ? 1 : 0) + additional_sn_private_c = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) : 0) additional_sn_public_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) additional_sn_public_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) additional_sn_public_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) From 102ef68357f7056f08d7cb3fa73db91bdc9605d7 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 14:27:43 +0200 Subject: [PATCH 09/12] Fix subnets --- cidr.tf | 12 ++++++------ locals.tf | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cidr.tf b/cidr.tf index 30b8bbc..47b7ab7 100644 --- a/cidr.tf +++ b/cidr.tf @@ -108,36 +108,36 @@ resource "aws_subnet" "additional_sn_public_c" { # route table associations resource "aws_route_table_association" "additional_rt_private_a" { - count = (local.enable_dynamic_subnets == true ? local.additional_sn_private_a : 1) + count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_a : 1) subnet_id = aws_subnet.additional_sn_private_a[count.index].id route_table_id = aws_route_table.rt_private.id } resource "aws_route_table_association" "additional_rt_private_b" { - count = (local.enable_dynamic_subnets == true ? local.additional_sn_private_b : 1) + count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_b : 1) subnet_id = aws_subnet.additional_sn_private_b[count.index].id route_table_id = aws_route_table.rt_private.id } resource "aws_route_table_association" "additional_rt_private_c" { - count = (local.enable_dynamic_subnets == true ? local.additional_sn_private_c : 1) + count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_c : 1) subnet_id = aws_subnet.additional_sn_private_c[count.index].id route_table_id = aws_route_table.rt_private.id } resource "aws_route_table_association" "additional_rt_public_a" { - count = (local.enable_dynamic_subnets == true ? local.additional_sn_public_a : 1) + count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_a : 1) subnet_id = aws_subnet.additional_sn_public_a[count.index].id route_table_id = aws_route_table.rt_public.id } resource "aws_route_table_association" "additional_rt_public_b" { - count = (local.enable_dynamic_subnets == true ? local.additional_sn_public_b : 1) + count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_b : 1) subnet_id = aws_subnet.additional_sn_public_b[count.index].id route_table_id = aws_route_table.rt_public.id } resource "aws_route_table_association" "additional_rt_public_c" { - count = (local.enable_dynamic_subnets == true ? local.additional_sn_public_c : 1) + count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_c : 1) subnet_id = aws_subnet.additional_sn_public_c[count.index].id route_table_id = aws_route_table.rt_public.id } \ No newline at end of file diff --git a/locals.tf b/locals.tf index 1519f6d..3650555 100644 --- a/locals.tf +++ b/locals.tf @@ -92,11 +92,11 @@ locals { # Additional CIDRs to VPC enable_additional_cidr = (length(var.vpc_additional_cidr) > 0 ? true : false) enable_additional_dynamic_subnets = (length(var.additional_private_subnets_a) > 0 || length(var.additional_private_subnets_b) > 0 || length(var.additional_private_subnets_c) > 0 || length(var.additional_public_subnets_a) > 0 || length(var.additional_public_subnets_b) > 0 || length(var.additional_public_subnets_c) > 0 ? true : false) - additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? 1 : 0) - additional_sn_private_b = (length(var.vpc_additional_cidr) > 0 ? 1 : 0) + additional_sn_private_a = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_a) > 0 ? length(var.additional_private_subnets_a) : 0)) : 0) + additional_sn_private_b = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_b) > 0 ? length(var.additional_private_subnets_b) : 0)) : 0) additional_sn_private_c = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_private_subnets_c) > 0 ? length(var.additional_private_subnets_c) : 0)) : 0) - additional_sn_public_a = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) - additional_sn_public_b = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) - additional_sn_public_c = (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) + additional_sn_public_a = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_a) > 0 ? length(var.additional_public_subnets_a) : 0)) : 0) + additional_sn_public_b = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_b) > 0 ? length(var.additional_public_subnets_b) : 0)) : 0) + additional_sn_public_c = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == false ? 1 : (length(var.additional_public_subnets_c) > 0 ? length(var.additional_public_subnets_c) : 0)) : 0) } From 0e6cf6704ddb52706c33beefcee88201b873841a Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 14:42:15 +0200 Subject: [PATCH 10/12] Fix rt association --- cidr.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cidr.tf b/cidr.tf index 47b7ab7..ed4c571 100644 --- a/cidr.tf +++ b/cidr.tf @@ -108,36 +108,36 @@ resource "aws_subnet" "additional_sn_public_c" { # route table associations resource "aws_route_table_association" "additional_rt_private_a" { - count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_a : 1) + count = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_a : 1) : 0) subnet_id = aws_subnet.additional_sn_private_a[count.index].id route_table_id = aws_route_table.rt_private.id } resource "aws_route_table_association" "additional_rt_private_b" { - count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_b : 1) + count = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_b : 1) : 0) subnet_id = aws_subnet.additional_sn_private_b[count.index].id route_table_id = aws_route_table.rt_private.id } resource "aws_route_table_association" "additional_rt_private_c" { - count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_c : 1) + count = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == true ? local.additional_sn_private_c : 1) : 0) subnet_id = aws_subnet.additional_sn_private_c[count.index].id route_table_id = aws_route_table.rt_private.id } resource "aws_route_table_association" "additional_rt_public_a" { - count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_a : 1) + count = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_a : 1) : 0) subnet_id = aws_subnet.additional_sn_public_a[count.index].id route_table_id = aws_route_table.rt_public.id } resource "aws_route_table_association" "additional_rt_public_b" { - count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_b : 1) + count = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_b : 1) : 0) subnet_id = aws_subnet.additional_sn_public_b[count.index].id route_table_id = aws_route_table.rt_public.id } resource "aws_route_table_association" "additional_rt_public_c" { - count = (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_c : 1) + count = (length(var.vpc_additional_cidr) > 0 ? (local.enable_additional_dynamic_subnets == true ? local.additional_sn_public_c : 1) : 0) subnet_id = aws_subnet.additional_sn_public_c[count.index].id route_table_id = aws_route_table.rt_public.id } \ No newline at end of file From e880d05904e127b52c7c5565143f9e4c583618e8 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 17:42:27 +0200 Subject: [PATCH 11/12] Update Changelog --- changelog.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 3029e18..18305c8 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +## 2.5.1 +FIX: +* Fix creation additonal networks for dynamic subnetting option + ## 2.5.0 ENHANCEMENTS: * Add support to multiple CIDRs in the a VPC @@ -9,7 +13,7 @@ ENHANCEMENTS: ## 2.3.2 FIX: -* FIx Transit Gateway attachments ([#55](https://github.com/zoitech/terraform-aws-network/issues/55)) +* Fix Transit Gateway attachments ([#55](https://github.com/zoitech/terraform-aws-network/issues/55)) ## 2.3.1 From cc32e41eac298f76db5744894a119b124b720f70 Mon Sep 17 00:00:00 2001 From: Aleksandr Gayvoronskiy Date: Tue, 27 Aug 2024 17:43:31 +0200 Subject: [PATCH 12/12] Fix typo --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 18305c8..e12b43c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ ## 2.5.1 FIX: -* Fix creation additonal networks for dynamic subnetting option +* Fix creation additional networks for dynamic subnetting option ## 2.5.0 ENHANCEMENTS: