Skip to content

Commit a710a31

Browse files
committed
Use local log_group throughout, fixing log configuration with Lambda@Edge.
Fixes terraform-aws-modules#650 and terraform-aws-modules#665.
1 parent 84dfbfd commit a710a31

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

main.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ locals {
1919
s3_key = var.s3_existing_package != null ? try(var.s3_existing_package.key, null) : (var.store_on_s3 ? var.s3_prefix != null ? format("%s%s", var.s3_prefix, replace(local.archive_filename_string, "/^.*//", "")) : replace(local.archive_filename_string, "/^\\.//", "") : null)
2020
s3_object_version = var.s3_existing_package != null ? try(var.s3_existing_package.version_id, null) : (var.store_on_s3 ? try(aws_s3_object.lambda_package[0].version_id, null) : null)
2121

22+
log_group = coalesce(var.logging_log_group, "/aws/lambda/${var.lambda_at_edge ? "us-east-1." : ""}${var.function_name}")
2223
}
2324

2425
resource "aws_lambda_function" "this" {
@@ -115,12 +116,12 @@ resource "aws_lambda_function" "this" {
115116
}
116117

117118
dynamic "logging_config" {
118-
# Dont create logging config on gov cloud as it is not avaible.
119+
# Dont create logging config on gov cloud as it is not available.
119120
# See https://github.com/hashicorp/terraform-provider-aws/issues/34810
120121
for_each = data.aws_partition.current.partition == "aws" ? [true] : []
121122

122123
content {
123-
log_group = var.logging_log_group
124+
log_group = local.log_group
124125
log_format = var.logging_log_format
125126
application_log_level = var.logging_log_format == "Text" ? null : var.logging_application_log_level
126127
system_log_level = var.logging_log_format == "Text" ? null : var.logging_system_log_level
@@ -218,13 +219,13 @@ resource "aws_s3_object" "lambda_package" {
218219
data "aws_cloudwatch_log_group" "lambda" {
219220
count = local.create && var.create_function && !var.create_layer && var.use_existing_cloudwatch_log_group ? 1 : 0
220221

221-
name = coalesce(var.logging_log_group, "/aws/lambda/${var.lambda_at_edge ? "us-east-1." : ""}${var.function_name}")
222+
name = local.log_group
222223
}
223224

224225
resource "aws_cloudwatch_log_group" "lambda" {
225226
count = local.create && var.create_function && !var.create_layer && !var.use_existing_cloudwatch_log_group ? 1 : 0
226227

227-
name = coalesce(var.logging_log_group, "/aws/lambda/${var.lambda_at_edge ? "us-east-1." : ""}${var.function_name}")
228+
name = local.log_group
228229
retention_in_days = var.cloudwatch_logs_retention_in_days
229230
kms_key_id = var.cloudwatch_logs_kms_key_id
230231
skip_destroy = var.cloudwatch_logs_skip_destroy

0 commit comments

Comments
 (0)