[PRMT-575] - Remove duplicate resources other than V2 Lambda

Author: MohammadIqbalAD-NHS

infrastructure/iam.tf

@@ -191,31 +191,6 @@ data "aws_iam_policy_document" "lambda_toggle_bulk_upload_document" {
   }
 }
 
-resource "aws_iam_policy" "lambda_toggle_bulk_upload_policy" {
-  name   = "${terraform.workspace}_lambda_toggle_bulk_upload_policy"
-  policy = data.aws_iam_policy_document.lambda_toggle_bulk_upload_document.json
-}
-
-data "aws_iam_policy_document" "v2_lambda_toggle_bulk_upload_document" {
-  statement {
-    effect = "Allow"
-
-    actions = [
-      "lambda:UpdateEventSourceMapping",
-      "lambda:GetEventSourceMapping"
-    ]
-
-    resources = [
-      aws_lambda_event_source_mapping.v2_bulk_upload_lambda.arn
-    ]
-  }
-}
-
-resource "aws_iam_policy" "v2_lambda_toggle_bulk_upload_policy" {
-  name   = "${terraform.workspace}_v2_lambda_toggle_bulk_upload_policy"
-  policy = data.aws_iam_policy_document.v2_lambda_toggle_bulk_upload_document.json
-}
-
 data "aws_iam_policy_document" "assume_role_policy_for_ods_report_lambda" {
   statement {
     actions = ["sts:AssumeRole"]

infrastructure/lambda-v2-bulk-upload-metadata.tf

@@ -1,5 +1,4 @@
 module "v2-bulk-upload-metadata-lambda" {
-  count          = local.is_sandbox || (terraform.workspace == "ndr-dev") ? 1 : 0
   source         = "./modules/lambda"
   name           = "V2BulkUploadMetadataLambda"
   handler        = "handlers.V2_bulk_upload_metadata_handler.lambda_handler"
@@ -8,8 +7,6 @@ module "v2-bulk-upload-metadata-lambda" {
   iam_role_policy_documents = [
     module.ndr-bulk-staging-store.s3_read_policy_document,
     module.ndr-bulk-staging-store.s3_write_policy_document,
-    module.v2-sqs-lg-bulk-upload-metadata-queue[0].sqs_read_policy_document,
-    module.v2-sqs-lg-bulk-upload-metadata-queue[0].sqs_write_policy_document,
     module.ndr-app-config.app_config_policy
   ]
 
@@ -22,7 +19,6 @@ module "v2-bulk-upload-metadata-lambda" {
     APPCONFIG_CONFIGURATION    = module.ndr-app-config.app_config_configuration_profile_id
     WORKSPACE                  = terraform.workspace
     STAGING_STORE_BUCKET_NAME  = "${terraform.workspace}-${var.staging_store_bucket_name}"
-    METADATA_SQS_QUEUE_URL     = module.v2-sqs-lg-bulk-upload-metadata-queue[0].sqs_url
     BULK_UPLOAD_DYNAMODB_NAME  = "${terraform.workspace}_${var.bulk_upload_report_dynamodb_table_name}"
     LLOYD_GEORGE_BUCKET_NAME   = "${terraform.workspace}-${var.lloyd_george_bucket_name}"
     LLOYD_GEORGE_DYNAMODB_NAME = "${terraform.workspace}_${var.lloyd_george_dynamodb_table_name}"
@@ -33,21 +29,21 @@ module "v2-bulk-upload-metadata-lambda" {
 
 module "v2-bulk-upload-metadata-alarm" {
   source               = "./modules/lambda_alarms"
-  lambda_function_name = module.v2-bulk-upload-metadata-lambda[0].function_name
-  lambda_timeout       = module.v2-bulk-upload-metadata-lambda[0].timeout
+  lambda_function_name = module.v2-bulk-upload-metadata-lambda.function_name
+  lambda_timeout       = module.v2-bulk-upload-metadata-lambda.timeout
   lambda_name          = "bulk_upload_metadata_handler"
   namespace            = "AWS/Lambda"
   alarm_actions        = [module.v2-bulk-upload-metadata-alarm-topic.arn]
   ok_actions           = [module.v2-bulk-upload-metadata-alarm-topic.arn]
-  depends_on           = [module.v2-bulk-upload-metadata-lambda[0], module.v2-bulk-upload-metadata-alarm-topic]
+  depends_on           = [module.v2-bulk-upload-metadata-lambda, module.v2-bulk-upload-metadata-alarm-topic]
 }
 
 module "v2-bulk-upload-metadata-alarm-topic" {
   source                = "./modules/sns"
   sns_encryption_key_id = module.sns_encryption_key.id
   topic_name            = "v2-bulk-upload-metadata-topic"
   topic_protocol        = "lambda"
-  topic_endpoint        = module.v2-bulk-upload-metadata-lambda[0].lambda_arn
+  topic_endpoint        = module.v2-bulk-upload-metadata-lambda.lambda_arn
   delivery_policy = jsonencode({
     "Version" : "2012-10-17",
     "Statement" : [
@@ -69,5 +65,5 @@ module "v2-bulk-upload-metadata-alarm-topic" {
     ]
   })
 
-  depends_on = [module.v2-bulk-upload-metadata-lambda[0], module.sns_encryption_key]
+  depends_on = [module.v2-bulk-upload-metadata-lambda, module.sns_encryption_key]
 }

infrastructure/lambda-v2-bulk-upload.tf

@@ -20,28 +20,3 @@ module "sqs-lg-bulk-upload-invalid-queue" {
   owner             = var.owner
   max_visibility    = 1020
 }
-
-module "v2-sqs-lg-bulk-upload-metadata-queue" {
-  count                = local.is_sandbox || (terraform.workspace == "ndr-dev") ? 1 : 0
-  source               = "./modules/sqs"
-  name                 = "v2-lg-bulk-upload-metadata-queue.fifo"
-  max_size_message     = 256 * 1024
-  message_retention    = 60 * 60 * 24 * 14
-  environment          = var.environment
-  owner                = var.owner
-  max_visibility       = 1020
-  enable_fifo          = true
-  enable_deduplication = true
-  delay                = 60
-}
-
-module "v2-sqs-lg-bulk-upload-invalid-queue" {
-  count             = local.is_sandbox || (terraform.workspace == "ndr-dev") ? 1 : 0
-  source            = "./modules/sqs"
-  name              = "v2-lg-bulk-upload-invalid-queue"
-  max_size_message  = 256 * 1024        # 256 KB
-  message_retention = 60 * 60 * 24 * 14 # 14 days
-  environment       = var.environment
-  owner             = var.owner
-  max_visibility    = 1020
-}

infrastructure/lambda-v2-toggle-bulk-upload.tf

@@ -225,33 +225,3 @@ resource "aws_lambda_permission" "toggle_bulk_upload_disable_permission" {
   principal     = "events.amazonaws.com"
   source_arn    = aws_cloudwatch_event_rule.bulk_upload_disable_rule.arn
 }
-
-resource "aws_cloudwatch_event_target" "v2_bulk_upload_enable_target" {
-  rule      = aws_cloudwatch_event_rule.bulk_upload_enable_rule.name
-  target_id = "v2-toggle-bulk-upload-enable"
-  arn       = module.v2-toggle-bulk-upload-lambda[0].lambda_arn
-  input     = jsonencode({ action = "enable" })
-}
-
-resource "aws_cloudwatch_event_target" "v2_bulk_upload_disable_target" {
-  rule      = aws_cloudwatch_event_rule.bulk_upload_disable_rule.name
-  target_id = "v2-toggle-bulk-upload-disable"
-  arn       = module.v2-toggle-bulk-upload-lambda[0].lambda_arn
-  input     = jsonencode({ action = "disable" })
-}
-
-resource "aws_lambda_permission" "v2_toggle_bulk_upload_enable_permission" {
-  statement_id  = "AllowExecutionFromCloudWatchEnable"
-  action        = "lambda:InvokeFunction"
-  function_name = module.v2-toggle-bulk-upload-lambda[0].function_name
-  principal     = "events.amazonaws.com"
-  source_arn    = aws_cloudwatch_event_rule.bulk_upload_enable_rule.arn
-}
-
-resource "aws_lambda_permission" "v2_toggle_bulk_upload_disable_permission" {
-  statement_id  = "AllowExecutionFromCloudWatchDisable"
-  action        = "lambda:InvokeFunction"
-  function_name = module.v2-toggle-bulk-upload-lambda[0].function_name
-  principal     = "events.amazonaws.com"
-  source_arn    = aws_cloudwatch_event_rule.bulk_upload_disable_rule.arn
-}