From f7cb6f8e64959e647f03eb5cff740f02255ecc41 Mon Sep 17 00:00:00 2001
From: Jan Sebastian Siwy <github@jansiwy.de>
Date: Mon, 23 Sep 2024 18:19:51 +0200
Subject: [PATCH 1/3] Add support for resource-specific tags

---
 availability-zone/main.tf      |  24 ++++++--
 availability-zone/variables.tf |  54 +++++++++++++++++
 main.tf                        |  29 +++++++--
 variables.tf                   | 108 +++++++++++++++++++++++++++++++++
 4 files changed, 203 insertions(+), 12 deletions(-)

diff --git a/availability-zone/main.tf b/availability-zone/main.tf
index 35f5069..62fd213 100644
--- a/availability-zone/main.tf
+++ b/availability-zone/main.tf
@@ -9,7 +9,9 @@ locals {
 resource "aws_route_table" "public" {
   vpc_id = var.vpc.id
 
-  tags = merge({ Name = "public - ${local.availability_zone}" }, var.default_tags)
+  tags = merge({
+    Name = "public - ${local.availability_zone}"
+  }, var.default_tags, var.public_route_table_tags)
 }
 
 resource "aws_route" "internet_gateway" {
@@ -25,7 +27,9 @@ resource "aws_subnet" "public" {
   availability_zone       = local.availability_zone
   map_public_ip_on_launch = true
 
-  tags = merge({ Name = "public - ${local.availability_zone}" }, var.default_tags)
+  tags = merge({
+    Name = "public - ${local.availability_zone}"
+  }, var.default_tags, var.public_subnet_tags)
 }
 
 resource "aws_route_table_association" "public" {
@@ -38,14 +42,18 @@ resource "aws_route_table_association" "public" {
 resource "aws_eip" "this" {
   domain = "vpc"
 
-  tags = merge({ Name = local.availability_zone }, var.default_tags)
+  tags = merge({
+    Name = local.availability_zone
+  }, var.default_tags, var.nat_gateway_eip_tags)
 }
 
 resource "aws_nat_gateway" "this" {
   subnet_id     = aws_subnet.public.id
   allocation_id = aws_eip.this.id
 
-  tags = merge({ Name = local.availability_zone }, var.default_tags)
+  tags = merge({
+    Name = local.availability_zone
+  }, var.default_tags, var.nat_gateway_tags)
 }
 
 # Private Subnet
@@ -53,7 +61,9 @@ resource "aws_nat_gateway" "this" {
 resource "aws_route_table" "private" {
   vpc_id = var.vpc.id
 
-  tags = merge({ Name = "private - ${local.availability_zone}" }, var.default_tags)
+  tags = merge({
+    Name = "private - ${local.availability_zone}"
+  }, var.default_tags, var.private_route_table_tags)
 }
 
 resource "aws_route" "nat_gateway" {
@@ -69,7 +79,9 @@ resource "aws_subnet" "private" {
   availability_zone       = local.availability_zone
   map_public_ip_on_launch = false
 
-  tags = merge({ Name = "private - ${local.availability_zone}" }, var.default_tags)
+  tags = merge({
+    Name = "private - ${local.availability_zone}"
+  }, var.default_tags, var.private_subnet_tags)
 }
 
 resource "aws_route_table_association" "private" {
diff --git a/availability-zone/variables.tf b/availability-zone/variables.tf
index 6119c51..49de713 100644
--- a/availability-zone/variables.tf
+++ b/availability-zone/variables.tf
@@ -17,6 +17,60 @@ Internet Gateway which belongs to `var.vpc`.
 EOS
 }
 
+variable "nat_gateway_eip_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the EIP of the NAT Gateway.
+EOS
+}
+
+variable "nat_gateway_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the NAT Gateway.
+EOS
+}
+
+variable "private_route_table_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the private route table.
+EOS
+}
+
+variable "private_subnet_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the private subnet.
+EOS
+}
+
+variable "public_route_table_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the public route table.
+EOS
+}
+
+variable "public_subnet_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the public subnet.
+EOS
+}
+
 variable "subnet_bits" {
   type = number
 
diff --git a/main.tf b/main.tf
index b64ca2b..e83d61a 100644
--- a/main.tf
+++ b/main.tf
@@ -9,7 +9,9 @@ resource "aws_vpc" "this" {
   enable_dns_support   = true
   enable_dns_hostnames = true
 
-  tags = merge({ Name = var.name }, var.default_tags)
+  tags = merge({
+    Name = var.name
+  }, var.default_tags, var.vpc_tags)
 }
 
 # Internet Gateway
@@ -17,7 +19,9 @@ resource "aws_vpc" "this" {
 resource "aws_internet_gateway" "this" {
   vpc_id = aws_vpc.this.id
 
-  tags = merge({ Name = var.name }, var.default_tags)
+  tags = merge({
+    Name = var.name
+  }, var.default_tags, var.internet_gateway_tags)
 }
 
 # Pairs of Public-Private Subnets per Availability Zone
@@ -32,6 +36,13 @@ module "availability_zone" {
   subnet_bits  = var.subnet_bits
   subnet_index = count.index
 
+  nat_gateway_eip_tags     = var.nat_gateway_eip_tags
+  nat_gateway_tags         = var.nat_gateway_tags
+  private_route_table_tags = var.private_route_table_tags
+  private_subnet_tags      = var.private_subnet_tags
+  public_route_table_tags  = var.public_route_table_tags
+  public_subnet_tags       = var.public_subnet_tags
+
   default_tags = var.default_tags
 }
 
@@ -45,7 +56,7 @@ resource "aws_db_subnet_group" "this" {
 
   subnet_ids = module.availability_zone[*].private_subnet.id
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.db_subnet_group_tags)
 }
 
 resource "aws_elasticache_subnet_group" "this" {
@@ -69,7 +80,9 @@ resource "aws_vpc_endpoint" "gateway" {
 
   route_table_ids = module.availability_zone[*].private_route_table.id
 
-  tags = merge({ Name = each.key }, var.default_tags)
+  tags = merge({
+    Name = each.key
+  }, var.default_tags, var.gateway_vpc_endpoint_tags)
 }
 
 # VPC Endpoints: type `Interface`
@@ -86,7 +99,9 @@ resource "aws_vpc_endpoint" "interface" {
   subnet_ids         = module.availability_zone[*].private_subnet.id
   security_group_ids = [aws_security_group.vpc-endpoints-interface[0].id]
 
-  tags = merge({ Name = each.key }, var.default_tags)
+  tags = merge({
+    Name = each.key
+  }, var.default_tags, var.interface_vpc_endpoint_tags)
 
   depends_on = [
     aws_security_group_rule.vpc-endpoints-interface-ingress,
@@ -102,7 +117,9 @@ resource "aws_security_group" "vpc-endpoints-interface" {
   name        = "vpc-endpoints-interface"
   description = "VPC Endpoints Interface"
 
-  tags = merge({ Name = "VPC Endpoints Interface" }, var.default_tags)
+  tags = merge({
+    Name = "VPC Endpoints Interface"
+  }, var.default_tags, var.interface_vpc_endpoint_security_group_tags)
 
   lifecycle {
     create_before_destroy = true
diff --git a/variables.tf b/variables.tf
index 5b21b0f..e73ec80 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1,3 +1,12 @@
+variable "db_subnet_group_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the DB subnet group.
+EOS
+}
+
 variable "cidr_block" {
   type = string
 
@@ -33,6 +42,15 @@ Map of tags assigned to all AWS resources created by this module.
 EOS
 }
 
+variable "internet_gateway_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the Internet Gateway.
+EOS
+}
+
 variable "name" {
   type = string
 
@@ -41,6 +59,60 @@ Name to be used in all `Name` tags shown in the AWS Console.
 EOS
 }
 
+variable "nat_gateway_eip_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the EIPs of the NAT Gateways.
+EOS
+}
+
+variable "nat_gateway_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the NAT Gateways.
+EOS
+}
+
+variable "private_route_table_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the private route tables.
+EOS
+}
+
+variable "private_subnet_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the private subnets.
+EOS
+}
+
+variable "public_route_table_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the public route tables.
+EOS
+}
+
+variable "public_subnet_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the public subnets.
+EOS
+}
+
 variable "size" {
   type = number
 
@@ -78,3 +150,39 @@ Every VPC endpoint belongs to a service name like `com.amazonaws.REGION.IDENTIFI
 The lists of this variable (grouped by VPC endpoint type) are expecting just the `IDENTIFIER` of the service name.
 EOS
 }
+
+variable "vpc_gateway_endpoint_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the VPC Endpoints with type `Gateway`.
+EOS
+}
+
+variable "interface_vpc_endpoint_security_group_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the security groups of the VPC Endpoints with type `Interface`.
+EOS
+}
+
+variable "interface_vpc_endpoint_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the VPC Endpoints with type `Interface`.
+EOS
+}
+
+variable "vpc_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the VPC.
+EOS
+}

From 6bf0a403ddb305de7d678c77040355f6d3c21899 Mon Sep 17 00:00:00 2001
From: Jan Sebastian Siwy <github@jansiwy.de>
Date: Mon, 23 Sep 2024 18:29:53 +0200
Subject: [PATCH 2/3] unify tags

---
 availability-zone/variables.tf | 12 ++++++------
 variables.tf                   | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/availability-zone/variables.tf b/availability-zone/variables.tf
index 49de713..05be684 100644
--- a/availability-zone/variables.tf
+++ b/availability-zone/variables.tf
@@ -22,7 +22,7 @@ variable "nat_gateway_eip_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the EIP of the NAT Gateway.
+Map of tags assigned to the EIP of the NAT Gateway created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -31,7 +31,7 @@ variable "nat_gateway_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the NAT Gateway.
+Map of tags assigned to the NAT Gateway created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -40,7 +40,7 @@ variable "private_route_table_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the private route table.
+Map of tags assigned to the private route table created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -49,7 +49,7 @@ variable "private_subnet_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the private subnet.
+Map of tags assigned to the private subnet created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -58,7 +58,7 @@ variable "public_route_table_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the public route table.
+Map of tags assigned to the public route table created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -67,7 +67,7 @@ variable "public_subnet_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the public subnet.
+Map of tags assigned to the public subnet created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
diff --git a/variables.tf b/variables.tf
index e73ec80..e38c0ca 100644
--- a/variables.tf
+++ b/variables.tf
@@ -3,7 +3,7 @@ variable "db_subnet_group_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the DB subnet group.
+Map of tags assigned to the DB subnet group created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -47,7 +47,7 @@ variable "internet_gateway_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the Internet Gateway.
+Map of tags assigned to the Internet Gateway created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -64,7 +64,7 @@ variable "nat_gateway_eip_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the EIPs of the NAT Gateways.
+Map of tags assigned to the EIPs of the NAT Gateways created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -73,7 +73,7 @@ variable "nat_gateway_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the NAT Gateways.
+Map of tags assigned to the NAT Gateways created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -82,7 +82,7 @@ variable "private_route_table_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the private route tables.
+Map of tags assigned to the private route tables created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -91,7 +91,7 @@ variable "private_subnet_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the private subnets.
+Map of tags assigned to the private subnets created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -100,7 +100,7 @@ variable "public_route_table_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the public route tables.
+Map of tags assigned to the public route tables created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -109,7 +109,7 @@ variable "public_subnet_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the public subnets.
+Map of tags assigned to the public subnets created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -156,7 +156,7 @@ variable "vpc_gateway_endpoint_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the VPC Endpoints with type `Gateway`.
+Map of tags assigned to the VPC Endpoints with type `Gateway` created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -165,7 +165,7 @@ variable "interface_vpc_endpoint_security_group_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the security groups of the VPC Endpoints with type `Interface`.
+Map of tags assigned to the security groups of the VPC Endpoints with type `Interface` created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -174,7 +174,7 @@ variable "interface_vpc_endpoint_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the VPC Endpoints with type `Interface`.
+Map of tags assigned to the VPC Endpoints with type `Interface` created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -183,6 +183,6 @@ variable "vpc_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the VPC.
+Map of tags assigned to the VPC created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }

From 2a6f78b62f46f0e6f5cadf9483711bb6b2f5f9ac Mon Sep 17 00:00:00 2001
From: Jan Sebastian Siwy <github@jansiwy.de>
Date: Mon, 23 Sep 2024 18:34:28 +0200
Subject: [PATCH 3/3] Update variables.tf

---
 variables.tf | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/variables.tf b/variables.tf
index e38c0ca..f33599e 100644
--- a/variables.tf
+++ b/variables.tf
@@ -42,6 +42,33 @@ Map of tags assigned to all AWS resources created by this module.
 EOS
 }
 
+variable "gateway_vpc_endpoint_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the VPC Endpoints with type `Gateway` created by this module. Tags in this map will override tags in `var.default_tags`.
+EOS
+}
+
+variable "interface_vpc_endpoint_security_group_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the security groups of the VPC Endpoints with type `Interface` created by this module. Tags in this map will override tags in `var.default_tags`.
+EOS
+}
+
+variable "interface_vpc_endpoint_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the VPC Endpoints with type `Interface` created by this module. Tags in this map will override tags in `var.default_tags`.
+EOS
+}
+
 variable "internet_gateway_tags" {
   type    = map(string)
   default = {}
@@ -151,33 +178,6 @@ The lists of this variable (grouped by VPC endpoint type) are expecting just the
 EOS
 }
 
-variable "vpc_gateway_endpoint_tags" {
-  type    = map(string)
-  default = {}
-
-  description = <<EOS
-Map of tags assigned to the VPC Endpoints with type `Gateway` created by this module. Tags in this map will override tags in `var.default_tags`.
-EOS
-}
-
-variable "interface_vpc_endpoint_security_group_tags" {
-  type    = map(string)
-  default = {}
-
-  description = <<EOS
-Map of tags assigned to the security groups of the VPC Endpoints with type `Interface` created by this module. Tags in this map will override tags in `var.default_tags`.
-EOS
-}
-
-variable "interface_vpc_endpoint_tags" {
-  type    = map(string)
-  default = {}
-
-  description = <<EOS
-Map of tags assigned to the VPC Endpoints with type `Interface` created by this module. Tags in this map will override tags in `var.default_tags`.
-EOS
-}
-
 variable "vpc_tags" {
   type    = map(string)
   default = {}