Merge pull request #3 from faisalvalli/bugfix/lambda-cloudwatch-log-association

faisalvalli · web-flow · commit 5ad4c3ce4d5d · 2025-06-17T16:26:34.000+01:00
Apply depends on for cloudwatch logs on lambda
diff --git a/modules/opennext-lambda/lambda.tf b/modules/opennext-lambda/lambda.tf
@@ -60,6 +60,8 @@ resource "aws_lambda_function" "function" {
       target_arn = var.dead_letter_config.target_arn
     }
   }
+
+  depends_on = [aws_cloudwatch_log_group.function_log_group]
 }
 
 resource "aws_lambda_function_url" "function_url" {
@@ -137,7 +139,7 @@ resource "aws_lambda_permission" "allow_execution_from_eventbridge" {
 }
 
 resource "aws_cloudwatch_log_group" "function_log_group" {
-  name              = "/aws/lambda/${aws_lambda_function.function.function_name}"
+  name              = "/aws/lambda/${var.function_name != null ? var.function_name : var.prefix}"
   skip_destroy      = true
   retention_in_days = var.log_group.retention_in_days
   kms_key_id        = var.log_group.kms_key_id

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ resource "aws_lambda_function" "function" {`
`60`	`60`	`target_arn = var.dead_letter_config.target_arn`
`61`	`61`	`}`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ depends_on = [aws_cloudwatch_log_group.function_log_group]`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`resource "aws_lambda_function_url" "function_url" {`
`@@ -137,7 +139,7 @@ resource "aws_lambda_permission" "allow_execution_from_eventbridge" {`
`137`	`139`	`}`
`138`	`140`
`139`	`141`	`resource "aws_cloudwatch_log_group" "function_log_group" {`
`140`		`- name = "/aws/lambda/${aws_lambda_function.function.function_name}"`
	`142`	`+ name = "/aws/lambda/${var.function_name != null ? var.function_name : var.prefix}"`
`141`	`143`	`skip_destroy = true`
`142`	`144`	`retention_in_days = var.log_group.retention_in_days`
`143`	`145`	`kms_key_id = var.log_group.kms_key_id`