[PRMP-579] change pathing for secondary bucket

Author: steph-torres-nhs

infrastructure/cloudfront.tf

@@ -10,15 +10,13 @@ module "cloudfront_firewall_waf_v2" {
 
 module "cloudfront-distribution-lg" {
   has_secondary_bucket          = true
-  secondary_bucket_domain_name  = module.ndr-document-pending-review-store.bucket_domain_name
+  secondary_bucket_domain_name  = module.ndr-document-pending-review-store.bucket_regional_domain_name
   secondary_bucket_id           = module.ndr-document-pending-review-store.bucket_id
-  secondary_bucket_path_pattern = "/test/*"
+  secondary_bucket_path_pattern = "/review/*"
   source                        = "./modules/cloudfront"
-  bucket_domain_name            = "${terraform.workspace}-${var.lloyd_george_bucket_name}.s3.eu-west-2.amazonaws.com"
+  bucket_domain_name            = module.ndr-lloyd-george-store.bucket_regional_domain_name
   bucket_id                     = module.ndr-lloyd-george-store.bucket_id
   qualifed_arn                  = module.edge-presign-lambda.qualified_arn
   depends_on                    = [module.edge-presign-lambda.qualified_arn, module.ndr-lloyd-george-store.bucket_id, module.ndr-lloyd-george-store.bucket_domain_name, module.ndr-document-pending-review-store.bucket_id, module.ndr-document-pending-review-store.bucket_domain_name]
   web_acl_id                    = try(module.cloudfront_firewall_waf_v2[0].arn, "")
-  # access_log_bucket             = local.is_production ? "${aws_s3_bucket.access_logs[0].bucket}.s3.eu-west-2.amazonaws.com" : null
-  # log_prefix                    = "cloudfront/"
 }

infrastructure/modules/cloudfront/main.tf

@@ -107,10 +107,6 @@ resource "aws_cloudfront_distribution" "distribution_with_secondary_bucket" {
   }
   web_acl_id = var.web_acl_id
 
-  # logging_config {
-  #   bucket = var.access_log_bucket
-  #   prefix = var.log_prefix
-  # }
 }
 
 

infrastructure/modules/cloudfront/variable.tf

@@ -39,12 +39,3 @@ variable "secondary_bucket_path_pattern" {
   type        = string
 }
 
-# variable "access_log_bucket" {
-#   description = "Bucket to store access logs"
-#   type        = string
-# }
-#
-# variable "log_prefix" {
-#   description = "Prefix to store access logs under"
-#   type        = string
-# }

infrastructure/modules/lambda_edge/README.md

@@ -58,7 +58,6 @@ module "s3_proxy_lambda" {
 |------|------|
 | [aws_iam_policy.combined_policies](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_role.lambda_exec_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
-| [aws_iam_role.lambda_execution_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role_policy.lambda_exec_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
 | [aws_iam_role_policy_attachment.default_policies](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
 | [aws_iam_role_policy_attachment.lambda_execution_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |

infrastructure/modules/s3/output.tf

@@ -24,4 +24,8 @@ output "s3_read_policy_document" {
 
 output "s3_write_policy_document" {
   value = data.aws_iam_policy_document.s3_write_policy.json
+}
+
+output "bucket_regional_domain_name" {
+  value = aws_s3_bucket.bucket.bucket_regional_domain_name
 }