From 6c620d587d1e1433b241a095c067d18ebbfeda1d Mon Sep 17 00:00:00 2001 From: Aaron George Date: Mon, 17 May 2021 11:57:33 +0100 Subject: [PATCH 1/2] Use statement prefix IDs for lambda permissions --- terraform/modules/team/main.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/modules/team/main.tf b/terraform/modules/team/main.tf index 641a402..b861f95 100644 --- a/terraform/modules/team/main.tf +++ b/terraform/modules/team/main.tf @@ -15,11 +15,11 @@ resource "aws_cloudwatch_event_target" "main" { } resource "aws_lambda_permission" "main" { - statement_id = "concourse-${var.name}-github-lambda-permission" - action = "lambda:InvokeFunction" - function_name = var.lambda_arn - principal = "events.amazonaws.com" - source_arn = aws_cloudwatch_event_rule.main.arn + statement_id_prefix = "concourse-${var.name}-github-lambda-permission-" + action = "lambda:InvokeFunction" + function_name = var.lambda_arn + principal = "events.amazonaws.com" + source_arn = aws_cloudwatch_event_rule.main.arn } locals { From 563120ea6d9c3d136f8550acba502b71baa2c76b Mon Sep 17 00:00:00 2001 From: Aaron George Date: Wed, 8 Feb 2023 13:46:39 +0000 Subject: [PATCH 2/2] Make statement ID prefix optional --- terraform/modules/team/main.tf | 3 ++- terraform/modules/team/variables.tf | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/terraform/modules/team/main.tf b/terraform/modules/team/main.tf index b861f95..1a4cc13 100644 --- a/terraform/modules/team/main.tf +++ b/terraform/modules/team/main.tf @@ -15,7 +15,8 @@ resource "aws_cloudwatch_event_target" "main" { } resource "aws_lambda_permission" "main" { - statement_id_prefix = "concourse-${var.name}-github-lambda-permission-" + statement_id = var.use_statement_id_prefix ? null : "concourse-${var.name}-github-lambda-permission" + statement_id_prefix = var.use_statement_id_prefix ? "concourse-${var.name}-github-lambda-permission-" : null action = "lambda:InvokeFunction" function_name = var.lambda_arn principal = "events.amazonaws.com" diff --git a/terraform/modules/team/variables.tf b/terraform/modules/team/variables.tf index 2de08dc..a17dfce 100644 --- a/terraform/modules/team/variables.tf +++ b/terraform/modules/team/variables.tf @@ -6,6 +6,12 @@ variable "name" { type = string } +variable "use_statement_id_prefix" { + description = "If the name is used as a prefix to a randomised name or not" + type = bool + default = false +} + variable "lambda_arn" { description = "ARN of the Github Lambda." type = string