Merge pull request #840 from NHSDigital/DTOSS-11768-fix-notify-api-variable

Remove all infra traces of `nhs_notify_api_message_batch_url`

Author: Harriethw

infrastructure/environments/review/variables.tfvars

@@ -9,4 +9,3 @@ protect_keyvault                      = false
 vnet_address_space                    = "10.142.0.0/16"
 deploy_database_as_container          = true
 seed_demo_data                        = true
-nhs_notify_api_message_batch_url      = "https://int.api.service.nhs.uk/comms/v1/message-batches"

infrastructure/modules/container-apps/variables.tf

@@ -94,12 +94,6 @@ variable "deploy_database_as_container" {
   type        = bool
 }
 
-variable "nhs_notify_api_message_batch_url" {
-  description = "The API endpoint URL used to send message batches to NHS Notify"
-  type        = string
-  default     = null
-}
-
 variable "postgres_backup_retention_days" {
   description = "The number of days to retain backups for the PostgreSQL Flexible Server."
   type        = number

infrastructure/terraform/main.tf

@@ -76,7 +76,6 @@ module "container-apps" {
   infra_key_vault_name                  = local.infra_key_vault_name
   infra_key_vault_rg                    = local.infra_key_vault_rg
   api_oauth_token_url                   = var.api_oauth_token_url
-  nhs_notify_api_message_batch_url      = var.nhs_notify_api_message_batch_url
   target_url                            = var.deploy_container_apps ? "${module.container-apps[0].external_url}healthcheck" : null
   resource_group_name_infra             = local.resource_group_name
   enable_notifications_jobs_schedule    = var.enable_notifications_jobs_schedule

infrastructure/terraform/variables.tf

@@ -173,11 +173,6 @@ variable "api_oauth_token_url" {
   type        = string
 }
 
-variable "nhs_notify_api_message_batch_url" {
-  description = "NHS Notify API endpoint URL for making message batch requests"
-  type        = string
-}
-
 variable "enable_notifications_jobs_schedule" {
   description = "Whether we apply the cron schedules for the notifications container app jobs"
   type        = bool

manage_breast_screening/config/.env.tpl

@@ -41,7 +41,6 @@ NBSS_MESH_INBOX_NAME="paste-mesh-inbox-name-here"
 NBSS_MESH_PASSWORD="paste-mesh-password-here"
 NBSS_MESH_CERT="paste-pem-mesh-cert-here"
 NBSS_MESH_PRIVATE_KEY="paste-pem-private-key-here"
-NHS_NOTIFY_API_MESSAGE_BATCH_URL="https://sandbox.api.service.nhs.uk/comms/v1/message-batches"
 QUEUE_STORAGE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;QueueEndpoint=http://127.0.0.1:10001/devstoreaccount1;TableEndpoint=http://127.0.0.1:10002/devstoreaccount1;"
 REPORTS_CONTAINER_NAME="notifications-reports"
 RETRY_QUEUE_NAME="notifications-message-batch-retries"

manage_breast_screening/notifications/services/api_client.py

@@ -23,7 +23,7 @@ class OAuthError(Exception):
 class ApiClient:
     def send_message_batch(self, message_batch: MessageBatch) -> requests.Response:
         response = requests.post(
-            os.getenv("NHS_NOTIFY_API_MESSAGE_BATCH_URL"),
+            os.getenv("NHS_NOTIFY_API_MESSAGE_BATCH_URL", ""),
             headers=self.headers(),
             json=MessageBatchPresenter(message_batch).present(),
             timeout=10,