Merge pull request #66 from ajschofield/alex/tf-improvements

pr: terraform improvements

1 files changed, 30 insertions, 27 deletions

diff --git a/terraform/events.tf b/terraform/events.tf
index 263141f..0113f5f 100644
--- a/terraform/events.tf
+++ b/terraform/events.tf
@@ -1,20 +1,16 @@
-resource "random_string" "eventbridge_suffix" {
-  length  = 8
-  special = false
-  upper   = false
-}
+#################
+# Random String #
+#################
 
-resource "random_string" "s3_ingestion_suffix" {
+resource "random_string" "suffix" {
   length  = 8
   special = false
   upper   = false
 }
 
-resource "random_string" "s3_transform_suffix" {
-  length  = 8
-  special = false
-  upper   = false
-}
+#############################
+# EventBridge Configuration #
+#############################
 
 resource "aws_cloudwatch_event_rule" "lambda_trigger" {
   name                = "lambda-scheduled-trigger"
@@ -25,66 +21,73 @@ resource "aws_cloudwatch_event_rule" "lambda_trigger" {
 resource "aws_cloudwatch_event_target" "extract_lambda_cw_event" {
   rule       = aws_cloudwatch_event_rule.lambda_trigger.name
   target_id  = "TargetFunctionV1"
-  arn        = aws_lambda_function.extract_lambda.arn #replaced lambda name placeholder
+  arn        = aws_lambda_function.extract_lambda.arn
   depends_on = [aws_lambda_permission.allow_eventbridge]
 }
 
 resource "aws_lambda_permission" "allow_eventbridge" {
-  statement_id  = "AllowExecutionFromEventBridge${random_string.eventbridge_suffix.result}"
+  statement_id  = "AllowExecutionFromEventBridge${random_string.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.eventbridge_suffix]
+    replace_triggered_by = [random_string.suffix]
   }
 }
 
-# below is step function 1
+########################################
+# S3 Extract Bucket Notification Setup #
+########################################
+
 resource "aws_lambda_permission" "allow_s3_ingestion" {
-  statement_id  = "AllowS3InvokeLambdaTransform${random_string.s3_ingestion_suffix.result}"
+  statement_id  = "AllowS3InvokeLambdaTransform${random_string.suffix.result}"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.transform_lambda.function_name #replaced lambda name placeholder
+  function_name = aws_lambda_function.transform_lambda.function_name
   principal     = "s3.amazonaws.com"
-  source_arn    = aws_s3_bucket.extract_bucket.arn #replaced bucket name placeholder
+  source_arn    = aws_s3_bucket.extract_bucket.arn
 
   lifecycle {
-    replace_triggered_by = [random_string.s3_ingestion_suffix]
+    replace_triggered_by = [random_string.suffix]
   }
 }
 
 
 resource "aws_s3_bucket_notification" "extract_bucket_notification" {
-  bucket = aws_s3_bucket.extract_bucket.id #replaced bucket name placeholder
+  bucket = aws_s3_bucket.extract_bucket.id
 
   lambda_function {
     events              = ["s3:ObjectCreated:*"]
-    lambda_function_arn = aws_lambda_function.transform_lambda.arn #replaced lambda name placeholder
+    lambda_function_arn = aws_lambda_function.transform_lambda.arn
   }
 
   depends_on = [aws_lambda_permission.allow_s3_ingestion]
 }
 
+##########################################
+# S3 Transform Bucket Notification Setup #
+##########################################
+
 resource "aws_lambda_permission" "allow_s3_transform_bucket" {
-  statement_id  = "AllowS3InvokeLambdaTransform${random_string.s3_transform_suffix.result}"
+  statement_id  = "AllowS3InvokeLambdaTransform${random_string.suffix.result}"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.transform_lambda.function_name #replaced lambda name placeholder
+  function_name = aws_lambda_function.transform_lambda.function_name
   principal     = "s3.amazonaws.com"
-  source_arn    = aws_s3_bucket.transform_bucket.arn #replaced bucket name placeholder
+  source_arn    = aws_s3_bucket.transform_bucket.arn
 
   lifecycle {
-    replace_triggered_by = [random_string.s3_transform_suffix]
+    replace_triggered_by = [random_string.suffix]
   }
 }
 
 
 resource "aws_s3_bucket_notification" "transform_bucket_notification" {
-  bucket = aws_s3_bucket.transform_bucket.id #replaced bucket name placeholder
+  bucket = aws_s3_bucket.transform_bucket.id
 
   lambda_function {
     events              = ["s3:ObjectCreated:*"]
-    lambda_function_arn = aws_lambda_function.transform_lambda.arn #replaced lambda name placeholder
+    lambda_function_arn = aws_lambda_function.transform_lambda.arn
   }
 
   depends_on = [aws_lambda_permission.allow_s3_transform_bucket]