Merge branch 'master' into VED-807-refactor-backend

Author: JamesW1-NHS

.github/pull_request_template.md

@@ -19,6 +19,7 @@ Add any other relevant notes or explanations here. **Remove this line if you hav
 
 :information_source: This section is to be filled in by the **reviewer**.
 
-- [ ] I have reviewed the changes in this PR and they fill all or part of the acceptance criteria of the ticket, and the code is in a mergeable state.
+- [ ] I have reviewed the changes in this PR and they fill all of the acceptance criteria of the ticket.
 - [ ] If there were infrastructure, operational, or build changes, I have made sure there is sufficient evidence that the changes will work.
-- [ ] I have ensured the changelog has been updated by the submitter, if necessary.
+- [ ] If there were changes that are outside of the regular release processes e.g. account infrastructure to setup, manual setup for external API integrations, secrets to set, then I have checked that the developer has flagged this to the Tech Lead as release steps.
+- [ ] I have checked that no Personal Identifiable Data (PID) is logged as part of the changes.

infrastructure/instance/.terraform.lock.hcl

@@ -28,7 +28,6 @@ locals {
     "IMMUNIZATION_BASE_PATH" = strcontains(var.sub_environment, "pr-") ? "immunisation-fhir-api/FHIR/R4-${var.sub_environment}" : "immunisation-fhir-api/FHIR/R4"
     # except for prod and ref, any other env uses PDS int environment
     "PDS_ENV"              = var.pds_environment
-    "PDS_CHECK_ENABLED"    = tostring(var.pds_check_enabled)
     "SPLUNK_FIREHOSE_NAME" = module.splunk.firehose_stream_name
     "SQS_QUEUE_URL"        = "https://sqs.eu-west-2.amazonaws.com/${var.immunisation_account_id}/${local.short_prefix}-ack-metadata-queue.fifo"
     "REDIS_HOST"           = data.aws_elasticache_cluster.existing_redis.cache_nodes[0].address

infrastructure/instance/endpoints.tf

@@ -3,6 +3,5 @@ immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 batch_error_notifications_enabled = true
-pds_check_enabled                 = false
 create_mesh_processor             = true
 has_sub_environment_scope         = true

infrastructure/instance/environments/dev/int/variables.tfvars

@@ -3,6 +3,5 @@ immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 batch_error_notifications_enabled = true
-pds_check_enabled                 = true
 create_mesh_processor             = false
 has_sub_environment_scope         = true

infrastructure/instance/environments/dev/internal-dev/variables.tfvars

@@ -3,6 +3,5 @@ immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 batch_error_notifications_enabled = false
-pds_check_enabled                 = true
 create_mesh_processor             = false
 has_sub_environment_scope         = true

infrastructure/instance/environments/dev/pr/variables.tfvars

@@ -3,6 +3,5 @@ immunisation_account_id           = "345594581768"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "ref"
 batch_error_notifications_enabled = true
-pds_check_enabled                 = true
 create_mesh_processor             = false
 has_sub_environment_scope         = true

infrastructure/instance/environments/dev/ref/variables.tfvars

@@ -3,6 +3,5 @@ immunisation_account_id           = "084828561157"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 batch_error_notifications_enabled = true
-pds_check_enabled                 = false
 create_mesh_processor             = false
 has_sub_environment_scope         = false

infrastructure/instance/environments/preprod/int-blue/variables.tfvars

@@ -3,6 +3,5 @@ immunisation_account_id           = "084828561157"
 dspp_core_account_id              = "603871901111"
 pds_environment                   = "int"
 batch_error_notifications_enabled = true
-pds_check_enabled                 = false
 create_mesh_processor             = false
 has_sub_environment_scope         = false

infrastructure/instance/environments/preprod/int-green/variables.tfvars

@@ -3,6 +3,5 @@ immunisation_account_id           = "664418956997"
 dspp_core_account_id              = "232116723729"
 pds_environment                   = "prod"
 batch_error_notifications_enabled = true
-pds_check_enabled                 = true
 create_mesh_processor             = true
 has_sub_environment_scope         = false