fix: Update aws_vpn_gateway_route_propagation private/intra count to use route_tables instead of subnets

GrahamOHagan · GrahamOHagan · commit 281bf5883e53 · 2025-05-02T14:39:25.000+01:00
diff --git a/main.tf b/main.tf
@@ -1219,8 +1219,9 @@ resource "aws_vpn_gateway_route_propagation" "public" {
   )
 }
 
+# There are as many routing tables as the number of NAT gateways
 resource "aws_vpn_gateway_route_propagation" "private" {
-  count = local.create_vpc && var.propagate_private_route_tables_vgw && (var.enable_vpn_gateway || var.vpn_gateway_id != "") ? local.len_private_subnets : 0
+  count = local.create_vpc && var.propagate_private_route_tables_vgw && (var.enable_vpn_gateway || var.vpn_gateway_id != "") ? local.nat_gateway_count : 0
 
   route_table_id = element(aws_route_table.private[*].id, count.index)
   vpn_gateway_id = element(
@@ -1233,7 +1234,7 @@ resource "aws_vpn_gateway_route_propagation" "private" {
 }
 
 resource "aws_vpn_gateway_route_propagation" "intra" {
-  count = local.create_vpc && var.propagate_intra_route_tables_vgw && (var.enable_vpn_gateway || var.vpn_gateway_id != "") ? local.len_intra_subnets : 0
+  count = local.create_vpc && var.propagate_intra_route_tables_vgw && (var.enable_vpn_gateway || var.vpn_gateway_id != "") ? local.num_intra_route_tables : 0
 
   route_table_id = element(aws_route_table.intra[*].id, count.index)
   vpn_gateway_id = element(

Original file line number	Diff line number	Diff line change
`@@ -1219,8 +1219,9 @@ resource "aws_vpn_gateway_route_propagation" "public" {`
`1219`	`1219`	`)`
`1220`	`1220`	`}`
`1221`	`1221`
	`1222`	`+# There are as many routing tables as the number of NAT gateways`
`1222`	`1223`	`resource "aws_vpn_gateway_route_propagation" "private" {`
`1223`		`- count = local.create_vpc && var.propagate_private_route_tables_vgw && (var.enable_vpn_gateway \|\| var.vpn_gateway_id != "") ? local.len_private_subnets : 0`
	`1224`	`+ count = local.create_vpc && var.propagate_private_route_tables_vgw && (var.enable_vpn_gateway \|\| var.vpn_gateway_id != "") ? local.nat_gateway_count : 0`
`1224`	`1225`
`1225`	`1226`	`route_table_id = element(aws_route_table.private[*].id, count.index)`
`1226`	`1227`	`vpn_gateway_id = element(`
`@@ -1233,7 +1234,7 @@ resource "aws_vpn_gateway_route_propagation" "private" {`
`1233`	`1234`	`}`
`1234`	`1235`
`1235`	`1236`	`resource "aws_vpn_gateway_route_propagation" "intra" {`
`1236`		`- count = local.create_vpc && var.propagate_intra_route_tables_vgw && (var.enable_vpn_gateway \|\| var.vpn_gateway_id != "") ? local.len_intra_subnets : 0`
	`1237`	`+ count = local.create_vpc && var.propagate_intra_route_tables_vgw && (var.enable_vpn_gateway \|\| var.vpn_gateway_id != "") ? local.num_intra_route_tables : 0`
`1237`	`1238`
`1238`	`1239`	`route_table_id = element(aws_route_table.intra[*].id, count.index)`
`1239`	`1240`	`vpn_gateway_id = element(`