Refactor

Author: bogsi17

terraform/data_replication/network.tf

@@ -39,22 +39,23 @@ resource "aws_subnet" "public_subnet" {
 }
 
 resource "aws_internet_gateway" "internet_gateway" {
-  count  = min(length(var.allowed_egress_cidr_blocks), 1)
+  count  = local.shared_egress_infrastructure_count
   vpc_id = aws_vpc.vpc.id
   tags = {
     Name = "data-replication-igw-${var.environment}"
   }
 }
 
 resource "aws_eip" "nat_ip" {
+  count      = local.shared_egress_infrastructure_count
   domain     = "vpc"
   depends_on = [aws_internet_gateway.internet_gateway]
 }
 
 resource "aws_nat_gateway" "nat_gateway" {
-  count             = min(length(var.allowed_egress_cidr_blocks), 1)
+  count             = local.shared_egress_infrastructure_count
   subnet_id         = aws_subnet.public_subnet.id
-  allocation_id     = aws_eip.nat_ip.id
+  allocation_id     = aws_eip.nat_ip[0].id
   connectivity_type = "public"
   depends_on        = [aws_internet_gateway.internet_gateway]
   tags = {

terraform/data_replication/variables.tf

@@ -82,8 +82,10 @@ variable "rails_master_key_path" {
 }
 
 locals {
-  name_prefix = "mavis-${var.environment}-data-replication"
-  subnet_list = [aws_subnet.subnet_a.id, aws_subnet.subnet_b.id]
+  name_prefix                        = "mavis-${var.environment}-data-replication"
+  subnet_list                        = [aws_subnet.subnet_a.id, aws_subnet.subnet_b.id]
+  shared_egress_infrastructure_count = min(length(var.allowed_egress_cidr_blocks), 1)
+
   task_envs = [
     {
       name  = "DB_HOST"