Revert "Merge pull request #141 from infrablocks/support-az-updates"

This reverts commit 0e05f06, reversing
changes made to e0396ae.

Author: johncowie

nat.tf

@@ -1,27 +1,27 @@
 resource "aws_eip" "nat" {
-  for_each = local.include_nat_gateways == "yes" ? toset(var.availability_zones) : toset([])
+  count = local.include_nat_gateways == "yes" ? length(var.availability_zones) : 0
 
   vpc = true
 
   tags = {
-    Name = "eip-nat-${var.component}-${var.deployment_identifier}-${each.value}"
+    Name = "eip-nat-${var.component}-${var.deployment_identifier}-${element(var.availability_zones, count.index)}"
     Component = var.component
     DeploymentIdentifier = var.deployment_identifier
   }
 }
 
 resource "aws_nat_gateway" "base" {
-  for_each = local.include_nat_gateways == "yes" ? toset(var.availability_zones) : toset([])
+  count = local.include_nat_gateways == "yes" ? length(var.availability_zones) : 0
 
-  allocation_id = aws_eip.nat[each.value].id
-  subnet_id = aws_subnet.public[each.value].id
+  allocation_id = element(aws_eip.nat.*.id, count.index)
+  subnet_id = element(aws_subnet.public.*.id, count.index)
 
   depends_on = [
     aws_internet_gateway.base_igw
   ]
 
   tags = {
-    Name = "nat-${var.component}-${var.deployment_identifier}-${each.value}"
+    Name = "nat-${var.component}-${var.deployment_identifier}-${element(var.availability_zones, count.index)}"
     Component = var.component
     DeploymentIdentifier = var.deployment_identifier
   }

outputs.tf

@@ -20,37 +20,37 @@ output "number_of_availability_zones" {
 
 output "public_subnet_ids" {
   description = "The IDs of the public subnets."
-  value = [for az in var.availability_zones : aws_subnet.public[az].id]
+  value = aws_subnet.public.*.id
 }
 
 output "public_subnet_cidr_blocks" {
   description = "The CIDRs of the public subnets."
-  value = [for az in var.availability_zones : aws_subnet.public[az].cidr_block]
+  value = aws_subnet.public.*.cidr_block
 }
 
 output "public_route_table_ids" {
   description = "The IDs of the public route tables."
-  value = [for az in var.availability_zones : aws_route_table.public[az].id]
+  value = aws_route_table.public.*.id
 }
 
 output "private_subnet_ids" {
   description = "The IDs of the private subnets."
-  value = [for az in var.availability_zones : aws_subnet.private[az].id]
+  value = aws_subnet.private.*.id
 }
 
 output "private_subnet_cidr_blocks" {
   description = "The CIDRs of the private subnets."
-  value = [for az in var.availability_zones : aws_subnet.private[az].cidr_block]
+  value = aws_subnet.private.*.cidr_block
 }
 
 output "private_route_table_ids" {
   description = "The IDs of the private route tables."
-  value = [for az in var.availability_zones : aws_route_table.private[az].id]
+  value = aws_route_table.private.*.id
 }
 
 output "nat_public_ips" {
   description = "The EIPs attached to the NAT gateways."
-  value = local.include_nat_gateways == "yes" ? [for az in var.availability_zones : aws_eip.nat[az].public_ip] : []
+  value = aws_eip.nat.*.public_ip
 }
 
 output "internet_gateway_id" {

private_subnets.tf

@@ -1,42 +1,38 @@
 resource "aws_subnet" "private" {
-  for_each = toset(var.availability_zones)
-
   vpc_id = aws_vpc.base.id
-  cidr_block = cidrsubnet(var.vpc_cidr, 8, index(var.availability_zones, each.value) + length(var.availability_zones) + local.private_subnets_offset)
-  availability_zone = each.value
+  count = length(var.availability_zones)
+  cidr_block = cidrsubnet(var.vpc_cidr, 8, count.index + length(var.availability_zones) + local.private_subnets_offset)
+  availability_zone = element(var.availability_zones, count.index)
 
   tags = {
-    Name = "private-subnet-${var.component}-${var.deployment_identifier}-${each.value}"
+    Name = "private-subnet-${var.component}-${var.deployment_identifier}-${element(var.availability_zones, count.index)}"
     Component = var.component
     DeploymentIdentifier = var.deployment_identifier
     Tier = "private"
   }
 }
 
 resource "aws_route_table" "private" {
-  for_each = toset(var.availability_zones)
-
   vpc_id = aws_vpc.base.id
+  count = length(var.availability_zones)
 
   tags = {
-    Name = "private-routetable-${var.component}-${var.deployment_identifier}-${each.value}"
+    Name = "private-routetable-${var.component}-${var.deployment_identifier}-${element(var.availability_zones, count.index)}"
     Component = var.component
     DeploymentIdentifier = var.deployment_identifier
     Tier = "private"
   }
 }
 
 resource "aws_route" "private_internet" {
-  for_each = local.include_nat_gateways == "yes" ? toset(var.availability_zones) : toset([])
-
-  route_table_id = aws_route_table.private[each.value].id
-  nat_gateway_id = aws_nat_gateway.base[each.value].id
+  count = local.include_nat_gateways == "yes" ? length(var.availability_zones) : 0
+  route_table_id = element(aws_route_table.private.*.id, count.index)
+  nat_gateway_id = element(aws_nat_gateway.base.*.id, count.index)
   destination_cidr_block = "0.0.0.0/0"
 }
 
 resource "aws_route_table_association" "private" {
-  for_each = toset(var.availability_zones)
-
-  subnet_id = aws_subnet.private[each.value].id
-  route_table_id = aws_route_table.private[each.value].id
+  count = length(var.availability_zones)
+  subnet_id = element(aws_subnet.private.*.id, count.index)
+  route_table_id = element(aws_route_table.private.*.id, count.index)
 }

public_subnets.tf

@@ -1,42 +1,38 @@
 resource "aws_subnet" "public" {
-  for_each = toset(var.availability_zones)
-
   vpc_id = aws_vpc.base.id
-  cidr_block = cidrsubnet(var.vpc_cidr, 8, index(var.availability_zones, each.value) + local.public_subnets_offset)
-  availability_zone = each.value
+  count = length(var.availability_zones)
+  cidr_block = cidrsubnet(var.vpc_cidr, 8, count.index + local.public_subnets_offset)
+  availability_zone = element(var.availability_zones, count.index)
 
   tags = {
-    Name = "public-subnet-${var.component}-${var.deployment_identifier}-${each.value}"
+    Name = "public-subnet-${var.component}-${var.deployment_identifier}-${element(var.availability_zones, count.index)}"
     Component = var.component
     DeploymentIdentifier = var.deployment_identifier
     Tier = "public"
   }
 }
 
 resource "aws_route_table" "public" {
-  for_each = toset(var.availability_zones)
-
   vpc_id = aws_vpc.base.id
+  count = length(var.availability_zones)
 
   tags = {
-    Name = "public-routetable-${var.component}-${var.deployment_identifier}-${each.value}"
+    Name = "public-routetable-${var.component}-${var.deployment_identifier}-${element(var.availability_zones, count.index)}"
     Component = var.component
     DeploymentIdentifier = var.deployment_identifier
     Tier = "public"
   }
 }
 
 resource "aws_route" "public_internet" {
-  for_each = toset(var.availability_zones)
-
-  route_table_id = aws_route_table.public[each.value].id
+  count = length(var.availability_zones)
+  route_table_id = element(aws_route_table.public.*.id, count.index)
   gateway_id = aws_internet_gateway.base_igw.id
   destination_cidr_block = "0.0.0.0/0"
 }
 
 resource "aws_route_table_association" "public" {
-  for_each = toset(var.availability_zones)
-
-  subnet_id = aws_subnet.public[each.value].id
-  route_table_id = aws_route_table.public[each.value].id
+  count = length(var.availability_zones)
+  subnet_id = element(aws_subnet.public.*.id, count.index)
+  route_table_id = element(aws_route_table.public.*.id, count.index)
 }