CCM-11586: Correct references to new modules

Author: masl2

infrastructure/terraform/components/api/module_domain_truststore.tf

@@ -13,11 +13,10 @@ module "domain_truststore" {
 
   bucket_logging_target = {
     bucket = module.logging_bucket.bucket
-    prefix = "${name}/"
+    prefix = "${local.csi_s3}-truststore/"
   }
 
   policy_documents = [
-    aws_iam_policy_document.truststore.json
   ]
 
 }

infrastructure/terraform/components/api/module_logging_bucket.tf

@@ -12,7 +12,7 @@ module "logging_bucket" {
   kms_key_arn = module.kms.key_id
 
   policy_documents = [
-    aws_iam_policy_document.logging.json
+    data.aws_iam_policy_document.logging.json
   ]
 }
 
@@ -29,7 +29,7 @@ data "aws_iam_policy_document" "logging" {
       actions = ["s3:PutObject"]
 
       resources = [
-        "${aws_s3_bucket.logging.arn}/*",
+        "${module.logging_bucket.arn}/*",
       ]
     }
 }

infrastructure/terraform/components/api/s3_bucket_object_truststore.tf

@@ -1,12 +1,12 @@
 # In manually configured (e.g. dev main, nonprod main, prod main) add lifecycle policy to permit manual management of cert
 resource "aws_s3_object" "placeholder_truststore" {
   count   = var.manually_configure_mtls_truststore ? 1 : 0
-  bucket  = aws_s3_bucket.truststore.bucket
+  bucket  = module.domain_truststore.bucket
   key     = "truststore.pem"
   content = module.supplier_ssl[0].cacert_pem
 
   depends_on = [
-    aws_s3_bucket_versioning.truststore,
+    module.domain_truststore,
     module.supplier_ssl
   ]
 
@@ -21,12 +21,12 @@ resource "aws_s3_object" "placeholder_truststore" {
 # Requires duplicate block as lifecycle policies cannot be dynamic
 resource "aws_s3_object" "placeholder_truststore_nonprod" {
   count   = !var.manually_configure_mtls_truststore ? 1 : 0
-  bucket  = aws_s3_bucket.truststore.bucket
+  bucket  = module.domain_truststore.bucket
   key     = "truststore.pem"
   content = module.supplier_ssl[0].cacert_pem
 
   depends_on = [
-    aws_s3_bucket_versioning.truststore,
+    module.domain_truststore,
     module.supplier_ssl
   ]
 }