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

---
 main.tf      |  8 ++++----
 variables.tf | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/main.tf b/main.tf
index b055e14..c30fb7f 100644
--- a/main.tf
+++ b/main.tf
@@ -34,7 +34,7 @@ resource "aws_lambda_function" "this" {
   filename         = try(var.archive_file.output_path, data.archive_file.this[0].output_path)
   source_code_hash = try(var.archive_file.output_base64sha256, data.archive_file.this[0].output_base64sha256)
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.lambda_function_tags)
 
   depends_on = [
     aws_cloudwatch_log_group.this,
@@ -57,7 +57,7 @@ resource "aws_iam_role" "this" {
 
   assume_role_policy = data.aws_iam_policy_document.lambda-assume-role.json
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.iam_role_tags)
 }
 
 data "aws_iam_policy_document" "lambda-assume-role" {
@@ -84,7 +84,7 @@ resource "aws_cloudwatch_log_group" "this" {
 
   retention_in_days = var.cloudwatch_log_group_retention_in_days
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.cloudwatch_log_group_tags)
 }
 
 data "aws_iam_policy_document" "cloudwatch-log-group" {
@@ -116,7 +116,7 @@ resource "aws_security_group" "this" {
 
   tags = merge({
     Name = "Lambda: ${var.function_name}"
-  }, var.default_tags)
+  }, var.default_tags, var.security_group_tags)
 
   lifecycle {
     create_before_destroy = true
diff --git a/variables.tf b/variables.tf
index 8b71c87..3319bdc 100644
--- a/variables.tf
+++ b/variables.tf
@@ -19,6 +19,15 @@ The number of days to retain the log of the Lambda function.
 EOS
 }
 
+variable "cloudwatch_log_group_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the CloudWatch log group used by the Lambda function.
+EOS
+}
+
 variable "default_tags" {
   type    = map(string)
   default = {}
@@ -61,6 +70,24 @@ The name of the method within your code that Lambda calls to execute your functi
 EOS
 }
 
+variable "iam_role_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the IAM role used by the Lambda function.
+EOS
+}
+
+variable "lambda_function_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the Lambda function.
+EOS
+}
+
 variable "layers" {
   type    = list(string)
   default = []
@@ -107,6 +134,15 @@ Permission will be added allowing the Lambda function to read the secret values.
 EOS
 }
 
+variable "security_group_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the security group used by the Lambda function (if placed into a VPC).
+EOS
+}
+
 variable "source_dir" {
   type    = string
   default = null

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

---
 variables.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/variables.tf b/variables.tf
index 3319bdc..2846bb6 100644
--- a/variables.tf
+++ b/variables.tf
@@ -24,7 +24,7 @@ variable "cloudwatch_log_group_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the CloudWatch log group used by the Lambda function.
+Map of tags assigned to the CloudWatch log group used by the Lambda function created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -75,7 +75,7 @@ variable "iam_role_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the IAM role used by the Lambda function.
+Map of tags assigned to the IAM role used by the Lambda function created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -84,7 +84,7 @@ variable "lambda_function_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the Lambda function.
+Map of tags assigned to the Lambda function created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }
 
@@ -139,7 +139,7 @@ variable "security_group_tags" {
   default = {}
 
   description = <<EOS
-Map of tags assigned to the security group used by the Lambda function (if placed into a VPC).
+Map of tags assigned to the security group used by the Lambda function (if placed into a VPC)  created by this module. Tags in this map will override tags in `var.default_tags`.
 EOS
 }