From 85b8d54c867a6e9123e33fba6e8623b5703f8ca8 Mon Sep 17 00:00:00 2001 From: Jan Sebastian Siwy Date: Mon, 23 Sep 2024 12:47:40 +0200 Subject: [PATCH 1/2] Breaking change: Rename `var.tags` to `var.default_tags` --- README.md | 5 ----- main.tf | 8 ++++---- variables.tf | 18 +++++++++--------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0cb8ec0..a233ef2 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,5 @@ module "lambda" { } source_dir = "lambda/src" - - tags = { - app = "example" - env = "production" - } } ``` diff --git a/main.tf b/main.tf index ee24a6c..b055e14 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.tags + tags = var.default_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.tags + tags = var.default_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.tags + tags = var.default_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.tags) + }, var.default_tags) lifecycle { create_before_destroy = true diff --git a/variables.tf b/variables.tf index db44944..8b71c87 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 "default_tags" { + type = map(string) + default = {} + + description = < Date: Mon, 23 Sep 2024 12:58:05 +0200 Subject: [PATCH 2/2] Update main.tf --- _test/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_test/main.tf b/_test/main.tf index e8ce173..73f592f 100644 --- a/_test/main.tf +++ b/_test/main.tf @@ -20,7 +20,7 @@ module "lambda" { source_dir = "lambda/src" - tags = { + default_tags = { app = "example" env = "production" }