From aa0d3722d6858d7f466e34883e7761ef991a4132 Mon Sep 17 00:00:00 2001 From: Fabian Fischer Date: Mon, 17 May 2021 10:47:18 +0200 Subject: [PATCH 1/3] fix: ensure tf0.15 compatibility --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 4569246e..ea2c73f2 100644 --- a/main.tf +++ b/main.tf @@ -25,7 +25,7 @@ locals { sid = "AllowWriteToCloudwatchLogs" effect = "Allow" actions = ["logs:CreateLogStream", "logs:PutLogEvents"] - resources = [replace("${element(concat(aws_cloudwatch_log_group.lambda[*].arn, list("")), 0)}:*", ":*:*", ":*")] + resources = [replace("${element(concat(aws_cloudwatch_log_group.lambda[*].arn, tolist("")), 0)}:*", ":*:*", ":*")] } lambda_policy_document_kms = { @@ -71,7 +71,7 @@ resource "aws_sns_topic_subscription" "sns_notify_teams" { module "lambda" { source = "terraform-aws-modules/lambda/aws" - version = "1.28.0" + version = "2.0.0" create = var.create From 61570c10e2e7d7f33189b1f2dc14f8af262e847c Mon Sep 17 00:00:00 2001 From: Fabian Fischer Date: Mon, 17 May 2021 10:50:17 +0200 Subject: [PATCH 2/3] fix: update output parameters to new version --- outputs.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/outputs.tf b/outputs.tf index 0a136e86..0b2e0d63 100644 --- a/outputs.tf +++ b/outputs.tf @@ -15,27 +15,27 @@ output "lambda_iam_role_name" { output "notify_teams_lambda_function_arn" { description = "The ARN of the Lambda function" - value = module.lambda.this_lambda_function_arn + value = module.lambda.lambda_function_arn } output "notify_teams_lambda_function_name" { description = "The name of the Lambda function" - value = module.lambda.this_lambda_function_name + value = module.lambda.lambda_function_name } output "notify_teams_lambda_function_invoke_arn" { description = "The ARN to be used for invoking Lambda function from API Gateway" - value = module.lambda.this_lambda_function_invoke_arn + value = module.lambda.lambda_function_invoke_arn } output "notify_teams_lambda_function_last_modified" { description = "The date Lambda function was last modified" - value = module.lambda.this_lambda_function_last_modified + value = module.lambda.lambda_function_last_modified } output "notify_teams_lambda_function_version" { description = "Latest published version of your Lambda function" - value = module.lambda.this_lambda_function_version + value = module.lambda.lambda_function_version } output "lambda_cloudwatch_log_group_arn" { From a993eeac51501178275c0ef26adb33611f4aa27b Mon Sep 17 00:00:00 2001 From: Fabian Fischer Date: Mon, 17 May 2021 10:59:14 +0200 Subject: [PATCH 3/3] fix: tolist workaround --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index ea2c73f2..ea07eea3 100644 --- a/main.tf +++ b/main.tf @@ -25,7 +25,7 @@ locals { sid = "AllowWriteToCloudwatchLogs" effect = "Allow" actions = ["logs:CreateLogStream", "logs:PutLogEvents"] - resources = [replace("${element(concat(aws_cloudwatch_log_group.lambda[*].arn, tolist("")), 0)}:*", ":*:*", ":*")] + resources = [replace("${element(concat(aws_cloudwatch_log_group.lambda[*].arn, tolist([""])), 0)}:*", ":*:*", ":*")] } lambda_policy_document_kms = { @@ -65,7 +65,7 @@ resource "aws_sns_topic_subscription" "sns_notify_teams" { topic_arn = local.sns_topic_arn protocol = "lambda" - endpoint = module.lambda.this_lambda_function_arn + endpoint = module.lambda.lambda_function_arn filter_policy = var.subscription_filter_policy }