CCM-11586: Correct references to new modules

Author: masl2

infrastructure/terraform/components/api/locals.tf

@@ -14,16 +14,4 @@ locals {
   })
 
   destination_arn = "arn:aws:logs:${var.region}:${var.shared_infra_account_id}:destination:nhs-main-obs-firehose-logs"
-
-  csi_s3 = replace(
-    format(
-      "%s-%s-%s-%s",
-      var.project,
-      var.aws_account_id,
-      var.region,
-      var.environment
-    ),
-    "_",
-    "",
-  )
 }

infrastructure/terraform/components/api/module_domain_truststore.tf

@@ -1,7 +1,7 @@
 module "domain_truststore" {
   source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket?ref=v2.0.17"
 
-  name           = "${local.csi_s3}-truststore"
+  name           = "truststore"
   aws_account_id = var.aws_account_id
   component      = var.component
   environment    = var.environment
@@ -13,7 +13,7 @@ module "domain_truststore" {
 
   bucket_logging_target = {
     bucket = module.logging_bucket.bucket
-    prefix = "${local.csi_s3}-truststore/"
+    prefix = "truststore/"
   }
 
   policy_documents = [

infrastructure/terraform/components/api/module_logging_bucket.tf

@@ -1,7 +1,7 @@
 module "logging_bucket" {
   source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket?ref=v2.0.17"
 
-  name           = "${local.csi_s3}-bucket-logs"
+  name           = "bucket-logs"
   aws_account_id = var.aws_account_id
   component      = var.component
   environment    = var.environment