Merge remote-tracking branch 'origin/main' into PRMP-541

Author: PedroSoaresNHS

infrastructure/lambda-mns-notification.tf

@@ -8,8 +8,8 @@ module "mns-notification-lambda" {
     module.sqs-mns-notification-queue[0].sqs_write_policy_document,
     module.lloyd_george_reference_dynamodb_table.dynamodb_write_policy_document,
     module.lloyd_george_reference_dynamodb_table.dynamodb_read_policy_document,
-    module.document_review_dynamodb_table[0].dynamodb_write_policy_document,
-    module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
+    local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_write_policy_document,
+    local.is_production ? "" : module.document_review_dynamodb_table[0].dynamodb_read_policy_document,
     aws_iam_policy.ssm_access_policy.policy,
     module.ndr-app-config.app_config_policy,
     aws_iam_policy.kms_mns_lambda_access[0].policy,
@@ -23,7 +23,7 @@ module "mns-notification-lambda" {
     APPCONFIG_CONFIGURATION       = module.ndr-app-config.app_config_configuration_profile_id
     WORKSPACE                     = terraform.workspace
     LLOYD_GEORGE_DYNAMODB_NAME    = module.lloyd_george_reference_dynamodb_table.table_name
-    DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? module.document_review_dynamodb_table[0].table_name : ""
+    DOCUMENT_REVIEW_DYNAMODB_NAME = local.is_production ? "" : module.document_review_dynamodb_table[0].table_name
     MNS_NOTIFICATION_QUEUE_URL    = module.sqs-mns-notification-queue[0].sqs_url
     PDS_FHIR_IS_STUBBED           = local.is_sandbox
   }

infrastructure/modules/lambda/main.tf

@@ -160,7 +160,7 @@ resource "aws_iam_role" "lambda_execution_role" {
 }
 
 data "aws_iam_policy_document" "merged_policy" {
-  source_policy_documents = concat(var.iam_role_policy_documents, [data.aws_iam_policy_document.lambda_kms_access.json])
+  source_policy_documents = concat(compact(var.iam_role_policy_documents), [data.aws_iam_policy_document.lambda_kms_access.json])
 }
 
 resource "aws_iam_policy" "combined_policies" {