CCM-8572: reshuffle

harrim91 · harrim91 · commit 30dec832e576 · 2025-03-18T12:41:01.000Z
diff --git a/infrastructure/terraform/components/app/module_backend_api.tf b/infrastructure/terraform/components/app/module_backend_api.tf
@@ -8,7 +8,6 @@ module "backend_api" {
   aws_account_id        = var.aws_account_id
   region                = var.region
   group                 = var.group
-  component             = var.component
   csi                   = local.csi
   log_retention_in_days = var.log_retention_in_days
   kms_key_arn           = module.kms.key_arn
diff --git a/infrastructure/terraform/components/sandbox/module_backend_api.tf b/infrastructure/terraform/components/sandbox/module_backend_api.tf
@@ -6,7 +6,6 @@ module "backend_api" {
   aws_account_id        = var.aws_account_id
   region                = var.region
   group                 = var.group
-  component             = var.component
   csi                   = local.csi
   log_retention_in_days = var.log_retention_in_days
 
diff --git a/infrastructure/terraform/modules/backend-api/README.md b/infrastructure/terraform/modules/backend-api/README.md
@@ -28,14 +28,17 @@ No requirements.
 |------|--------|---------|
 | <a name="module_authorizer_build"></a> [authorizer\_build](#module\_authorizer\_build) | ../typescript-build-zip | n/a |
 | <a name="module_authorizer_lambda"></a> [authorizer\_lambda](#module\_authorizer\_lambda) | ../lambda-function | n/a |
+| <a name="module_build_get_s3_object_tags_lambda"></a> [build\_get\_s3\_object\_tags\_lambda](#module\_build\_get\_s3\_object\_tags\_lambda) | ../typescript-build-zip | n/a |
 | <a name="module_build_template_client"></a> [build\_template\_client](#module\_build\_template\_client) | ../typescript-build-zip | n/a |
 | <a name="module_build_template_lambda"></a> [build\_template\_lambda](#module\_build\_template\_lambda) | ../typescript-build-zip | n/a |
 | <a name="module_create_template_lambda"></a> [create\_template\_lambda](#module\_create\_template\_lambda) | ../lambda-function | n/a |
 | <a name="module_get_template_lambda"></a> [get\_template\_lambda](#module\_get\_template\_lambda) | ../lambda-function | n/a |
+| <a name="module_lambda_get_s3_object_tags"></a> [lambda\_get\_s3\_object\_tags](#module\_lambda\_get\_s3\_object\_tags) | ../lambda-function | n/a |
 | <a name="module_list_template_lambda"></a> [list\_template\_lambda](#module\_list\_template\_lambda) | ../lambda-function | n/a |
 | <a name="module_object_tagging_enrichment_quarantine"></a> [object\_tagging\_enrichment\_quarantine](#module\_object\_tagging\_enrichment\_quarantine) | ../s3-object-tagging-enrichment | n/a |
 | <a name="module_s3bucket_internal"></a> [s3bucket\_internal](#module\_s3bucket\_internal) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v1.0.8 |
 | <a name="module_s3bucket_quarantine"></a> [s3bucket\_quarantine](#module\_s3bucket\_quarantine) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v1.0.8 |
+| <a name="module_sqs_tags_added"></a> [sqs\_tags\_added](#module\_sqs\_tags\_added) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs | v1.0.8 |
 | <a name="module_update_template_lambda"></a> [update\_template\_lambda](#module\_update\_template\_lambda) | ../lambda-function | n/a |
 ## Outputs
 
diff --git a/infrastructure/terraform/modules/backend-api/cloudwatch_event_rule_object_tags_added.tf b/infrastructure/terraform/modules/backend-api/cloudwatch_event_rule_object_tags_added.tf
@@ -7,7 +7,7 @@ resource "aws_cloudwatch_event_rule" "tags_added" {
     detailType = ["Object Tags Added"]
     detail = {
       bucket = {
-        name = [var.source_bucket.name]
+        name = [module.s3bucket_quarantine.id]
       }
     }
   })
diff --git a/infrastructure/terraform/modules/backend-api/locals.tf b/infrastructure/terraform/modules/backend-api/locals.tf
@@ -1,5 +1,5 @@
 locals {
-  csi = "${var.csi}-${var.module}"
+  csi = "${var.csi}-${var.component}"
 
   lambdas_source_code_dir = abspath("${path.module}/../../../../lambdas")
 
diff --git a/infrastructure/terraform/modules/backend-api/module_lambda_get_s3_object_tags.tf b/infrastructure/terraform/modules/backend-api/module_lambda_get_s3_object_tags.tf
@@ -52,3 +52,14 @@ data "aws_iam_policy_document" "get_s3_object_tags" {
     resources = ["${var.source_bucket.arn}/*"]
   }
 }
+
+module "build_get_s3_object_tags_lambda" {
+  source = "../typescript-build-zip"
+
+  source_code_dir = abspath("${path.module}/../../../../lambdas/get-s3-object-tags")
+
+  entrypoints = [
+    "src/get-s3-object-tags.ts"
+  ]
+}
+
diff --git a/infrastructure/terraform/modules/backend-api/module_sqs_tags_added.tf b/infrastructure/terraform/modules/backend-api/module_sqs_tags_added.tf
@@ -6,7 +6,6 @@ module "sqs_tags_added" {
   environment    = var.environment
   project        = var.project
   region         = var.region
-  module         = "ote"
   name           = var.id
 
   sqs_kms_key_arn = var.kms_key_arn
diff --git a/infrastructure/terraform/modules/backend-api/pipes_pipe_tags_added.tf b/infrastructure/terraform/modules/backend-api/pipes_pipe_tags_added.tf
@@ -4,14 +4,14 @@ resource "aws_pipes_pipe" "tags_added" {
   role_arn = aws_iam_role.pipe.arn
 
   source     = module.sqs_tags_added.sqs_queue_arn
-  target     = var.target_event_bus_arn
+  target     = data.aws_cloudwatch_event_bus.default.arn
   enrichment = module.lambda_get_s3_object_tags.function_arn
 
   target_parameters {
     eventbridge_event_bus_parameters {
       detail_type = "object-tags-enriched"
-      source      = var.output_event_source
-      resources   = [var.source_bucket.arn]
+      source      = "templates.${var.environment}.${var.project}"
+      resources   = [module.s3bucket_quarantine.arn]
     }
   }
 }
@@ -81,7 +81,7 @@ data "aws_iam_policy_document" "pipe" {
     effect  = "Allow"
     actions = ["events:PutEvent"]
     resources = [
-      var.target_event_bus_arn
+      data.aws_cloudwatch_event_bus.default.arn
     ]
   }
 }
diff --git a/infrastructure/terraform/modules/backend-api/variables.tf b/infrastructure/terraform/modules/backend-api/variables.tf
@@ -28,14 +28,13 @@ variable "group" {
 }
 
 
-variable "component" {
-  type        = string
-  description = "The variable encapsulating the name of the component"
-}
+##
+# tfscaffold variables specific to this component
+##
 
-variable "module" {
+variable "component" {
   type        = string
-  description = "The variable encapsulating the name of this module"
+  description = "The variable encapsulating the name of this component"
   default     = "api"
 }
 
diff --git a/infrastructure/terraform/modules/s3-object-tagging-enrichment/README.md b/infrastructure/terraform/modules/s3-object-tagging-enrichment/README.md
diff --git a/infrastructure/terraform/modules/s3-object-tagging-enrichment/locals.tf b/infrastructure/terraform/modules/s3-object-tagging-enrichment/locals.tf
diff --git a/infrastructure/terraform/modules/s3-object-tagging-enrichment/module_build_get_s3_object_tags_lambda.tf b/infrastructure/terraform/modules/s3-object-tagging-enrichment/module_build_get_s3_object_tags_lambda.tf
diff --git a/infrastructure/terraform/modules/s3-object-tagging-enrichment/variables.tf b/infrastructure/terraform/modules/s3-object-tagging-enrichment/variables.tf

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ resource "aws_cloudwatch_event_rule" "tags_added" {`
`7`	`7`	`detailType = ["Object Tags Added"]`
`8`	`8`	`detail = {`
`9`	`9`	`bucket = {`
`10`		`- name = [var.source_bucket.name]`
	`10`	`+ name = [module.s3bucket_quarantine.id]`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`})`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@ resource "aws_pipes_pipe" "tags_added" {`
`4`	`4`	`role_arn = aws_iam_role.pipe.arn`
`5`	`5`
`6`	`6`	`source = module.sqs_tags_added.sqs_queue_arn`
`7`		`- target = var.target_event_bus_arn`
	`7`	`+ target = data.aws_cloudwatch_event_bus.default.arn`
`8`	`8`	`enrichment = module.lambda_get_s3_object_tags.function_arn`
`9`	`9`
`10`	`10`	`target_parameters {`
`11`	`11`	`eventbridge_event_bus_parameters {`
`12`	`12`	`detail_type = "object-tags-enriched"`
`13`		`- source = var.output_event_source`
`14`		`- resources = [var.source_bucket.arn]`
	`13`	`+ source = "templates.${var.environment}.${var.project}"`
	`14`	`+ resources = [module.s3bucket_quarantine.arn]`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
`@@ -81,7 +81,7 @@ data "aws_iam_policy_document" "pipe" {`
`81`	`81`	`effect = "Allow"`
`82`	`82`	`actions = ["events:PutEvent"]`
`83`	`83`	`resources = [`
`84`		`- var.target_event_bus_arn`
	`84`	`+ data.aws_cloudwatch_event_bus.default.arn`
`85`	`85`	`]`
`86`	`86`	`}`
`87`	`87`	`}`