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

---
 main.tf             |  7 +++++--
 subnet/main.tf      |  4 ++--
 subnet/variables.tf | 18 ++++++++++++++++++
 variables.tf        | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/main.tf b/main.tf
index d563137..53eb28d 100644
--- a/main.tf
+++ b/main.tf
@@ -10,6 +10,9 @@ module "subnets" {
   availability_zone = each.key
   cidr_block        = each.value
 
+  route_table_tags = var.route_table_tags
+  subnet_tags      = var.subnet_tags
+
   default_tags = var.default_tags
 }
 
@@ -23,7 +26,7 @@ resource "aws_lb" "this" {
   internal = true
   subnets  = values(module.subnets)[*].this.id
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.lb_tags)
 }
 
 # API Gateway VPC Link
@@ -32,5 +35,5 @@ resource "aws_api_gateway_vpc_link" "this" {
   name        = var.name
   target_arns = [aws_lb.this.arn]
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.api_gateway_vpc_link_tags)
 }
diff --git a/subnet/main.tf b/subnet/main.tf
index d434b4d..6ed86fb 100644
--- a/subnet/main.tf
+++ b/subnet/main.tf
@@ -8,7 +8,7 @@ resource "aws_subnet" "this" {
 
   tags = merge({
     Name = "private - ${var.name} - ${var.availability_zone}"
-  }, var.default_tags)
+  }, var.default_tags, var.subnet_tags)
 }
 
 resource "aws_route_table" "this" {
@@ -16,7 +16,7 @@ resource "aws_route_table" "this" {
 
   tags = merge({
     Name = "private - ${var.name} - ${var.availability_zone}"
-  }, var.default_tags)
+  }, var.default_tags, var.route_table_tags)
 }
 
 resource "aws_route_table_association" "this" {
diff --git a/subnet/variables.tf b/subnet/variables.tf
index d11c8c4..b7faba6 100644
--- a/subnet/variables.tf
+++ b/subnet/variables.tf
@@ -31,6 +31,24 @@ Name of the NLB.
 EOS
 }
 
+variable "route_table_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the route table.
+EOS
+}
+
+variable "subnet_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the subnet.
+EOS
+}
+
 variable "vpc" {
   type = object({
     id = string
diff --git a/variables.tf b/variables.tf
index a5271a5..2b80be9 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1,3 +1,12 @@
+variable "api_gateway_vpc_link_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the API Gateway VPC Link.
+EOS
+}
+
 variable "cidr_blocks" {
   type = map(string)
 
@@ -15,6 +24,15 @@ Map of tags assigned to all AWS resources created by this module.
 EOS
 }
 
+variable "lb_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the NLB.
+EOS
+}
+
 variable "name" {
   type = string
 
@@ -23,6 +41,24 @@ Name of the NLB.
 EOS
 }
 
+variable "route_table_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the route tables.
+EOS
+}
+
+variable "subnet_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the subnets.
+EOS
+}
+
 variable "vpc" {
   type = object({
     id = string

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

---
 subnet/variables.tf | 4 ++--
 variables.tf        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/subnet/variables.tf b/subnet/variables.tf
index b7faba6..7b0aab8 100644
--- a/subnet/variables.tf
+++ b/subnet/variables.tf
@@ -36,7 +36,7 @@ variable "route_table_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the route table.
+Map of tags assigned to the route table created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -45,7 +45,7 @@ variable "subnet_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the subnet.
+Map of tags assigned to the 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 2b80be9..060cc2c 100644
--- a/variables.tf
+++ b/variables.tf
@@ -3,7 +3,7 @@ variable "api_gateway_vpc_link_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the API Gateway VPC Link.
+Map of tags assigned to the API Gateway VPC Link created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -29,7 +29,7 @@ variable "lb_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the NLB.
+Map of tags assigned to the NLB created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -46,7 +46,7 @@ variable "route_table_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the route tables.
+Map of tags assigned to the route tables created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -55,7 +55,7 @@ variable "subnet_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the subnets.
+Map of tags assigned to the subnets created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }