From 878bc93458232ab607f69e88bf0c8ad75e7b8326 Mon Sep 17 00:00:00 2001 From: irsanchez Date: Thu, 2 Oct 2025 12:06:54 -0500 Subject: [PATCH 1/2] New vars/logic to allow conditional mgmt of log group resource --- lambda_function/lambda_function.tf | 5 +++-- lambda_function/variables.tf | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lambda_function/lambda_function.tf b/lambda_function/lambda_function.tf index 24222c0..440b05e 100644 --- a/lambda_function/lambda_function.tf +++ b/lambda_function/lambda_function.tf @@ -3,6 +3,7 @@ locals { } resource "aws_cloudwatch_log_group" "lambda_log_group" { + count = var.manage_log_group ? 1 : 0 name = local.log_group_name retention_in_days = var.log_retention_in_days tags = var.log_tags == {} ? var.tags : var.log_tags @@ -10,9 +11,9 @@ resource "aws_cloudwatch_log_group" "lambda_log_group" { } resource "aws_cloudwatch_log_subscription_filter" "example_subscription_filter" { - count = var.ship_logs_to_sumo ? 1 : 0 + count = var.manage_log_group && var.ship_logs_to_sumo ? 1 : 0 name = coalesce(var.subscription_filter_name, "${var.function_name}_subscription_filter") - log_group_name = aws_cloudwatch_log_group.lambda_log_group.name + log_group_name = var.manage_log_group ? aws_cloudwatch_log_group.lambda_log_group[0].name : local.log_group_name destination_arn = "arn:aws:lambda:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:function:SumoCWLogsLambda" filter_pattern = "" } diff --git a/lambda_function/variables.tf b/lambda_function/variables.tf index 0159a0a..b3b1c4e 100644 --- a/lambda_function/variables.tf +++ b/lambda_function/variables.tf @@ -201,3 +201,8 @@ variable "log_tags" { default = {} description = "Tags to apply to the log group. Defaults to the same tags as the lambda function if nothing is passed in." } + +variable "manage_log_group" { + type = bool + default = true +} From dfc19e2e8b3877cf744f6b8a9b9b25290ee49247 Mon Sep 17 00:00:00 2001 From: irsanchez Date: Thu, 2 Oct 2025 13:11:12 -0500 Subject: [PATCH 2/2] Reverted subscription count logic --- lambda_function/lambda_function.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda_function/lambda_function.tf b/lambda_function/lambda_function.tf index 440b05e..1734bfe 100644 --- a/lambda_function/lambda_function.tf +++ b/lambda_function/lambda_function.tf @@ -11,7 +11,7 @@ resource "aws_cloudwatch_log_group" "lambda_log_group" { } resource "aws_cloudwatch_log_subscription_filter" "example_subscription_filter" { - count = var.manage_log_group && var.ship_logs_to_sumo ? 1 : 0 + count = var.ship_logs_to_sumo ? 1 : 0 name = coalesce(var.subscription_filter_name, "${var.function_name}_subscription_filter") log_group_name = var.manage_log_group ? aws_cloudwatch_log_group.lambda_log_group[0].name : local.log_group_name destination_arn = "arn:aws:lambda:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:function:SumoCWLogsLambda"