NRL-1664 Fixes to terraform and add to truststore script

Author: axelkrastek1-nhs

README.md

@@ -65,7 +65,7 @@ In order to do this, make sure you have AWS CLI installed and configured, then r
 make ENV=env truststore-pull-all
 ```
 
-Where `env` is one of `dev`, `qa` , `int`, `ref` or `prod`.
+Where `env` is one of `dev`, `qa` , `int`, `perftest`, `ref` or `prod`.
 
 ## Getting Started
 

scripts/truststore.sh

@@ -229,17 +229,19 @@ function _restore_archived_cert() {
 }
 
 function _truststore_build_all() {
-    _truststore_build_ca "prod" "record-locator.national.nhs.uk_CA2"
-    _truststore_build_ca "int"  "record-locator.int.national.nhs.uk_CA2"
-    _truststore_build_ca "ref"  "record-locator.ref.national.nhs.uk_CA2"
-    _truststore_build_ca "qa"   "qa.record-locator.national.nhs.uk_CA2"
-    _truststore_build_ca "dev"  "record-locator.dev.national.nhs.uk_CA2"
-
-    _truststore_build_cert "prod" "prod" "api.record-locator.national.nhs.uk"
-    _truststore_build_cert "int"  "int"  "int.api.record-locator.int.national.nhs.uk"
-    _truststore_build_cert "ref"  "ref"  "ref.api.record-locator.ref.national.nhs.uk"
-    _truststore_build_cert "qa"   "qa"   "api.qa.record-locator.national.nhs.uk"
-    _truststore_build_cert "dev"  "dev"  "dev.api.record-locator.dev.national.nhs.uk"
+    _truststore_build_ca "prod"     "record-locator.national.nhs.uk_CA2"
+    _truststore_build_ca "int"      "record-locator.int.national.nhs.uk_CA2"
+    _truststore_build_ca "ref"      "record-locator.ref.national.nhs.uk_CA2"
+    _truststore_build_ca "perftest" "perftest.record-locator.national.nhs.uk_CA2"
+    _truststore_build_ca "qa"       "qa.record-locator.national.nhs.uk_CA2"
+    _truststore_build_ca "dev"      "record-locator.dev.national.nhs.uk_CA2"
+
+    _truststore_build_cert "prod"     "prod" "api.record-locator.national.nhs.uk"
+    _truststore_build_cert "int"      "int"  "int.api.record-locator.int.national.nhs.uk"
+    _truststore_build_cert "ref"      "ref"  "ref.api.record-locator.ref.national.nhs.uk"
+    _truststore_build_cert "perftest" "perftest"  "api.perftest.record-locator.national.nhs.uk"
+    _truststore_build_cert "qa"       "qa"   "api.qa.record-locator.national.nhs.uk"
+    _truststore_build_cert "dev"      "dev"  "dev.api.record-locator.dev.national.nhs.uk"
 
     echo -e "✅ Successfully built all truststore files"
     return 0

terraform/account-wide-infrastructure/test/domain.tf

@@ -42,7 +42,7 @@ module "ref-custom-domain-name" {
 module "perftest-custom-domain-name" {
   source                        = "../modules/env-custom-domain-name"
   domain_name                   = var.perftest_api_domain_name
-  domain_zone                   = aws_route53_zone.test-perftest-api-ns.name
+  domain_zone                   = aws_route53_zone.test-perftest-ns.name
   mtls_certificate_file         = "s3://${module.perftest-truststore-bucket.bucket_name}/${module.perftest-truststore-bucket.certificates_object_key}"
   mtls_certificate_file_version = module.perftest-truststore-bucket.certificates_object_version
 }