Merge branch 'master' into dependabot/pip/tests/e2e/cryptography-44.0.1

Author: dlzhry2nhs

infrastructure/instance/Makefile

@@ -53,6 +53,9 @@ destroy: workspace
 	$(tf_cmd) workspace select default
 	$(tf_cmd) workspace delete $(sub_environment)
 
+graph: workspace
+	$(tf_cmd) graph 
+
 output:
 	$(tf_cmd) output -raw $(name)
 

infrastructure/instance/ecs_batch_processor_config.tf

@@ -258,6 +258,7 @@ resource "aws_iam_role" "fifo_pipe_role" {
     ]
   })
 }
+
 resource "aws_iam_policy" "fifo_pipe_policy" {
   name = "${local.short_prefix}-fifo-pipe-policy"
   policy = jsonencode({
@@ -356,6 +357,10 @@ resource "aws_pipes_pipe" "fifo_pipe" {
       log_group_arn = aws_cloudwatch_log_group.pipe_log_group.arn
     }
   }
+
+  depends_on = [
+    aws_iam_role_policy_attachment.fifo_pipe_policy_attachment
+  ]
 }
 
 # Custom Log Group

infrastructure/instance/redis_sync_lambda.tf

@@ -262,6 +262,10 @@ resource "aws_s3_bucket_notification" "config_lambda_notification" {
     lambda_function_arn = aws_lambda_function.redis_sync_lambda.arn
     events              = ["s3:ObjectCreated:*"]
   }
+
+  depends_on = [
+    aws_lambda_function.redis_sync_lambda
+  ]
 }
 
 # Permission for the new S3 bucket to invoke the Lambda function

utilities/scripts/calculate_version.py

@@ -23,7 +23,7 @@
 import semver
 
 SCRIPT_LOCATION = os.path.join(os.path.dirname(os.path.abspath(__file__)))
-REPO_ROOT = os.path.abspath(os.path.join(SCRIPT_LOCATION, ".."))
+REPO_ROOT = os.path.abspath(os.path.join(SCRIPT_LOCATION, "../.."))
 REPO = git.Repo(REPO_ROOT)