[PRMP-579] address PR comments

Author: steph-torres-nhs

infrastructure/buckets.tf

@@ -149,7 +149,7 @@ module "ndr-document-pending-review-store" {
   source                    = "./modules/s3"
   access_logs_enabled       = local.is_production
   access_logs_bucket_id     = local.access_logs_bucket_id
-  bucket_name               = var.document_review_bucket_name
+  bucket_name               = var.document_pending_review_bucket_name
   environment               = var.environment
   owner                     = var.owner
   enable_bucket_versioning  = true
@@ -265,7 +265,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "pdm_document_store" {
   }
 }
 
-resource "aws_s3_bucket_lifecycle_configuration" "ndr-document_pending_review" {
+resource "aws_s3_bucket_lifecycle_configuration" "ndr_document_pending_review-store" {
   bucket = module.ndr-document-pending-review-store.bucket_id
   rule {
     id     = "default-to-intelligent-tiering"

infrastructure/cloudfront.tf

@@ -9,14 +9,14 @@ module "cloudfront_firewall_waf_v2" {
 }
 
 module "cloudfront-distribution-lg" {
-  has_secondary_bucket          = true
-  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 = "/review/*"
   source                        = "./modules/cloudfront"
   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, "")
+  has_secondary_bucket          = true
+  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 = "/review/*"
 }

infrastructure/modules/cloudfront/main.tf

@@ -12,7 +12,9 @@ resource "aws_cloudfront_origin_access_control" "cloudfront_s3_oac" {
 }
 
 resource "aws_cloudfront_distribution" "distribution" {
-  count = var.has_secondary_bucket ? 0 : 1
+  count       = var.has_secondary_bucket ? 0 : 1
+  price_class = "PriceClass_100"
+
   origin {
     domain_name              = var.bucket_domain_name
     origin_id                = var.bucket_id
@@ -52,6 +54,7 @@ resource "aws_cloudfront_distribution" "distribution_with_secondary_bucket" {
   count           = var.has_secondary_bucket ? 1 : 0
   enabled         = true
   is_ipv6_enabled = true
+  price_class     = "PriceClass_100"
 
   origin {
     domain_name              = var.bucket_domain_name

infrastructure/modules/cloudfront/variable.tf

@@ -20,22 +20,22 @@ variable "web_acl_id" {
 }
 
 variable "has_secondary_bucket" {
-  description = "Whether distribution is associated with a secondary buckets"
+  description = "Whether distribution is associated with a secondary bucket"
   type        = bool
 }
 
 variable "secondary_bucket_id" {
-  description = "Secondary bucket IDs"
+  description = "Secondary bucket ID"
   type        = string
 }
 
 variable "secondary_bucket_domain_name" {
-  description = "Secondary bucket domain names"
+  description = "Secondary bucket domain name"
   type        = string
 }
 
 variable "secondary_bucket_path_pattern" {
-  description = "Path patter for secondary bucket"
+  description = "Path pattern for secondary bucket"
   type        = string
 }
 

infrastructure/modules/s3/README.md

@@ -101,6 +101,7 @@ module "s3_bucket" {
 | <a name="output_bucket_arn"></a> [bucket\_arn](#output\_bucket\_arn) | n/a |
 | <a name="output_bucket_domain_name"></a> [bucket\_domain\_name](#output\_bucket\_domain\_name) | n/a |
 | <a name="output_bucket_id"></a> [bucket\_id](#output\_bucket\_id) | n/a |
+| <a name="output_bucket_regional_domain_name"></a> [bucket\_regional\_domain\_name](#output\_bucket\_regional\_domain\_name) | n/a |
 | <a name="output_s3_list_object_policy"></a> [s3\_list\_object\_policy](#output\_s3\_list\_object\_policy) | n/a |
 | <a name="output_s3_object_access_policy"></a> [s3\_object\_access\_policy](#output\_s3\_object\_access\_policy) | n/a |
 | <a name="output_s3_read_policy_document"></a> [s3\_read\_policy\_document](#output\_s3\_read\_policy\_document) | n/a |

infrastructure/variable.tf

@@ -81,7 +81,7 @@ variable "ca_pem_filename" {
   default     = "ndr-truststore.pem"
 }
 
-variable "document_review_bucket_name" {
+variable "document_pending_review_bucket_name" {
   type        = string
   description = "The S3 bucket name to store documents pending review"
   default     = "document-pending-review-store"