Skip to content

Commit 0a2f2c0

Browse files
committed
Remove all infra traces of nhs_notify_api_message_batch_url
We no longer need this but it was only partially deleted in previous PR. Remaining couple of references in code will be deleted.
1 parent 9ca4a23 commit 0a2f2c0

File tree

6 files changed

+1
-15
lines changed

6 files changed

+1
-15
lines changed

infrastructure/environments/review/variables.tfvars

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ protect_keyvault = false
99
vnet_address_space = "10.142.0.0/16"
1010
deploy_database_as_container = true
1111
seed_demo_data = true
12-
nhs_notify_api_message_batch_url = "https://int.api.service.nhs.uk/comms/v1/message-batches"

infrastructure/modules/container-apps/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,6 @@ variable "deploy_database_as_container" {
9494
type = bool
9595
}
9696

97-
variable "nhs_notify_api_message_batch_url" {
98-
description = "The API endpoint URL used to send message batches to NHS Notify"
99-
type = string
100-
default = null
101-
}
102-
10397
variable "postgres_backup_retention_days" {
10498
description = "The number of days to retain backups for the PostgreSQL Flexible Server."
10599
type = number

infrastructure/terraform/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ module "container-apps" {
7676
infra_key_vault_name = local.infra_key_vault_name
7777
infra_key_vault_rg = local.infra_key_vault_rg
7878
api_oauth_token_url = var.api_oauth_token_url
79-
nhs_notify_api_message_batch_url = var.nhs_notify_api_message_batch_url
8079
target_url = var.deploy_container_apps ? "${module.container-apps[0].external_url}healthcheck" : null
8180
resource_group_name_infra = local.resource_group_name
8281
enable_notifications_jobs_schedule = var.enable_notifications_jobs_schedule

infrastructure/terraform/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,6 @@ variable "api_oauth_token_url" {
173173
type = string
174174
}
175175

176-
variable "nhs_notify_api_message_batch_url" {
177-
description = "NHS Notify API endpoint URL for making message batch requests"
178-
type = string
179-
}
180-
181176
variable "enable_notifications_jobs_schedule" {
182177
description = "Whether we apply the cron schedules for the notifications container app jobs"
183178
type = bool

manage_breast_screening/config/.env.tpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ NBSS_MESH_INBOX_NAME="paste-mesh-inbox-name-here"
4141
NBSS_MESH_PASSWORD="paste-mesh-password-here"
4242
NBSS_MESH_CERT="paste-pem-mesh-cert-here"
4343
NBSS_MESH_PRIVATE_KEY="paste-pem-private-key-here"
44-
NHS_NOTIFY_API_MESSAGE_BATCH_URL="https://sandbox.api.service.nhs.uk/comms/v1/message-batches"
4544
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;"
4645
REPORTS_CONTAINER_NAME="notifications-reports"
4746
RETRY_QUEUE_NAME="notifications-message-batch-retries"

manage_breast_screening/notifications/services/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class OAuthError(Exception):
2323
class ApiClient:
2424
def send_message_batch(self, message_batch: MessageBatch) -> requests.Response:
2525
response = requests.post(
26-
os.getenv("NHS_NOTIFY_API_MESSAGE_BATCH_URL"),
26+
os.getenv("NHS_NOTIFY_API_MESSAGE_BATCH_URL", ""),
2727
headers=self.headers(),
2828
json=MessageBatchPresenter(message_batch).present(),
2929
timeout=10,

0 commit comments

Comments
 (0)