improvement: allow specific tags on public and private subnets by name

Author: toneill-newinnov

main.tf

@@ -120,7 +120,11 @@ resource "aws_subnet" "public" {
     },
     var.tags,
     var.public_subnet_tags,
-    lookup(var.public_subnet_tags_per_az, element(var.azs, count.index), {})
+    lookup(var.public_subnet_tags_per_az, element(var.azs, count.index), {}),
+    lookup(var.public_subnet_tags_per_name, try(
+      var.public_subnet_names[count.index],
+      format("${var.name}-${var.public_subnet_suffix}-%s", element(var.azs, count.index))
+    ))
   )
 }
 
@@ -255,7 +259,11 @@ resource "aws_subnet" "private" {
     },
     var.tags,
     var.private_subnet_tags,
-    lookup(var.private_subnet_tags_per_az, element(var.azs, count.index), {})
+    lookup(var.private_subnet_tags_per_az, element(var.azs, count.index), {}),
+    lookup(var.private_subnet_tags_per_name, try(
+      var.private_subnet_names[count.index],
+      format("${var.name}-${var.private_subnet_suffix}-%s", element(var.azs, count.index))
+    ))
   )
 }
 

variables.tf

@@ -256,6 +256,12 @@ variable "public_subnet_tags_per_az" {
   default     = {}
 }
 
+variable "public_subnet_tags_per_name" {
+  description = "Additional tags for the public subnets where the primary key is the Name"
+  type        = map(map(string))
+  default     = {}
+}
+
 variable "public_route_table_tags" {
   description = "Additional tags for the public route tables"
   type        = map(string)
@@ -390,6 +396,12 @@ variable "private_subnet_tags_per_az" {
   default     = {}
 }
 
+variable "private_subnet_tags_per_name" {
+  description = "Additional tags for the private subnets where the primary key is the Name"
+  type        = map(map(string))
+  default     = {}
+}
+
 variable "private_route_table_tags" {
   description = "Additional tags for the private route tables"
   type        = map(string)