CCM-8418: Changes in response to review comments

Author: chris-elliott-nhsd

infrastructure/terraform/components/acct/README.md

@@ -36,7 +36,7 @@
 | <a name="module_kms_sandbox"></a> [kms\_sandbox](#module\_kms\_sandbox) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/kms | v1.0.8 |
 | <a name="module_obs_datasource"></a> [obs\_datasource](#module\_obs\_datasource) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/obs-datasource | v2.0.3 |
 | <a name="module_s3bucket_access_logs"></a> [s3bucket\_access\_logs](#module\_s3bucket\_access\_logs) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v1.0.9 |
-| <a name="module_s3bucket_artefacts"></a> [s3bucket\_artefacts](#module\_s3bucket\_artefacts) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v1.0.8 |
+| <a name="module_s3bucket_artefacts"></a> [s3bucket\_artefacts](#module\_s3bucket\_artefacts) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v2.0.2 |
 | <a name="module_s3bucket_backup_reports"></a> [s3bucket\_backup\_reports](#module\_s3bucket\_backup\_reports) | git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket | v1.0.8 |
 | <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 5.19.0 |
 ## Outputs

infrastructure/terraform/components/acct/module_s3bucket_artefacts.tf

@@ -1,5 +1,5 @@
 module "s3bucket_artefacts" {
-  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket?ref=v1.0.8"
+  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/s3bucket?ref=v2.0.2"
 
   name = "artefacts"
 

infrastructure/terraform/components/acct/outputs.tf

@@ -12,16 +12,16 @@ output "github_pat_ssm_param_name" {
 
 output "s3_buckets" {
   value = {
-    backup_reports = {
-      arn    = module.s3bucket_backup_reports.arn
-      bucket = module.s3bucket_backup_reports.bucket
-      id     = module.s3bucket_backup_reports.id
-    }
     artefacts = {
       arn    = module.s3bucket_artefacts.arn
       bucket = module.s3bucket_artefacts.bucket
       id     = module.s3bucket_artefacts.id
     }
+    backup_reports = {
+      arn    = module.s3bucket_backup_reports.arn
+      bucket = module.s3bucket_backup_reports.bucket
+      id     = module.s3bucket_backup_reports.id
+    }
   }
 }
 

infrastructure/terraform/components/sandbox/README.md

@@ -17,6 +17,7 @@ No requirements.
 | <a name="input_kms_deletion_window"></a> [kms\_deletion\_window](#input\_kms\_deletion\_window) | When a kms key is deleted, how long should it wait in the pending deletion state? | `string` | `"30"` | no |
 | <a name="input_letter_suppliers"></a> [letter\_suppliers](#input\_letter\_suppliers) | Letter suppliers enabled in the environment | <pre>map(object({<br/>    enable_polling   = bool<br/>    default_supplier = optional(bool)<br/>  }))</pre> | <pre>{<br/>  "WTMMOCK": {<br/>    "default_supplier": true,<br/>    "enable_polling": true<br/>  }<br/>}</pre> | no |
 | <a name="input_log_retention_in_days"></a> [log\_retention\_in\_days](#input\_log\_retention\_in\_days) | The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite | `number` | `0` | no |
+| <a name="input_parent_acct_environment"></a> [parent\_acct\_environment](#input\_parent\_acct\_environment) | Name of the environment responsible for the acct resources used, affects things like DNS zone. Useful for named dev environments | `string` | `"main"` | no |
 | <a name="input_project"></a> [project](#input\_project) | The name of the tfscaffold project | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The AWS Region | `string` | n/a | yes |
 ## Modules

infrastructure/terraform/components/sandbox/locals.tf

@@ -13,7 +13,7 @@ data "terraform_remote_state" "acct" {
       var.project,
       var.aws_account_id,
       "eu-west-2",
-      local.parent_acct_environment
+      var.parent_acct_environment
     )
 
     region = "eu-west-2"

infrastructure/terraform/components/sandbox/locals_remote_state.tf

@@ -9,7 +9,7 @@ module "backend_api" {
   group                   = var.group
   csi                     = local.csi
   log_retention_in_days   = var.log_retention_in_days
-  parent_acct_environment = local.parent_acct_environment
+  parent_acct_environment = var.parent_acct_environment
   function_s3_bucket      = local.acct.s3_buckets["artefacts"]["id"]
 
 

infrastructure/terraform/components/sandbox/module_backend_api.tf

@@ -87,3 +87,8 @@ variable "letter_suppliers" {
   description = "Letter suppliers enabled in the environment"
 }
 
+variable "parent_acct_environment" {
+  type        = string
+  description = "Name of the environment responsible for the acct resources used, affects things like DNS zone. Useful for named dev environments"
+  default     = "main"
+}

infrastructure/terraform/components/sandbox/variables.tf

@@ -1,8 +1,9 @@
 locals {
   csi = "${var.csi}-${var.module}"
 
-  repo_root               = abspath("${path.module}/../../../..")
-  lambdas_source_code_dir = abspath("${local.repo_root}/lambdas")
+  lambdas_dir = "../../../../lambdas"
+
+  lambdas_source_code_dir = abspath("${path.module}/${local.lambdas_dir}")
   pdfjs_layer_zip         = abspath("${local.lambdas_source_code_dir}/layers/pdfjs/dist/layer/pdfjs-layer.zip")
   pdfjs_layer_lockfile    = abspath("${local.lambdas_source_code_dir}/layers/pdfjs/package-lock.json")
 

infrastructure/terraform/modules/backend-api/locals.tf

@@ -27,6 +27,6 @@ module "authorizer_lambda" {
     USER_POOL_CLIENT_ID = var.cognito_config["USER_POOL_CLIENT_ID"],
   }
   function_s3_bucket      = var.function_s3_bucket
-  function_code_base_path = ""
-  function_code_dir       = "../../../../lambdas/authorizer/dist"
+  function_code_base_path = local.lambdas_dir
+  function_code_dir       = "authorizer/dist"
 }