Merge branch 'development' into alex/py-improvements

1 files changed, 22 insertions, 7 deletions

diff --git a/terraform/events.tf b/terraform/events.tf
index 0113f5f..53ae10a 100644
--- a/terraform/events.tf
+++ b/terraform/events.tf
@@ -2,7 +2,19 @@
 # Random String #
 #################
 
-resource "random_string" "suffix" {
+resource "random_string" "eventbridge_suffix" {
+  length  = 8
+  special = false
+  upper   = false
+}
+
+resource "random_string" "s3_ingestion_suffix" {
+  length  = 8
+  special = false
+  upper   = false
+}
+
+resource "random_string" "s3_transform_suffix" {
   length  = 8
   special = false
   upper   = false
@@ -26,14 +38,15 @@ resource "aws_cloudwatch_event_target" "extract_lambda_cw_event" {
 }
 
 resource "aws_lambda_permission" "allow_eventbridge" {
-  statement_id  = "AllowExecutionFromEventBridge${random_string.suffix.result}"
+  statement_id  = "AllowExecutionFromEventBridge${random_string.eventbridge_suffix.result}"
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.extract_lambda.function_name
   principal     = "events.amazonaws.com"
   source_arn    = aws_cloudwatch_event_rule.lambda_trigger.arn
 
   lifecycle {
-    replace_triggered_by = [random_string.suffix]
+    create_before_destroy = true
+    replace_triggered_by  = [random_string.eventbridge_suffix]
   }
 }
 
@@ -42,14 +55,15 @@ resource "aws_lambda_permission" "allow_eventbridge" {
 ########################################
 
 resource "aws_lambda_permission" "allow_s3_ingestion" {
-  statement_id  = "AllowS3InvokeLambdaTransform${random_string.suffix.result}"
+  statement_id  = "AllowS3InvokeLambdaTransform${random_string.s3_ingestion_suffix.result}"
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.transform_lambda.function_name
   principal     = "s3.amazonaws.com"
   source_arn    = aws_s3_bucket.extract_bucket.arn
 
   lifecycle {
-    replace_triggered_by = [random_string.suffix]
+    create_before_destroy = true
+    replace_triggered_by  = [random_string.s3_ingestion_suffix]
   }
 }
 
@@ -70,14 +84,15 @@ resource "aws_s3_bucket_notification" "extract_bucket_notification" {
 ##########################################
 
 resource "aws_lambda_permission" "allow_s3_transform_bucket" {
-  statement_id  = "AllowS3InvokeLambdaTransform${random_string.suffix.result}"
+  statement_id  = "AllowS3InvokeLambdaTransform${random_string.s3_transform_suffix.result}"
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.transform_lambda.function_name
   principal     = "s3.amazonaws.com"
   source_arn    = aws_s3_bucket.transform_bucket.arn
 
   lifecycle {
-    replace_triggered_by = [random_string.suffix]
+    create_before_destroy = true
+    replace_triggered_by  = [random_string.s3_transform_suffix]
   }
 }