From 18287eb5509767dbc1265c4d079405ebdc67b5a0 Mon Sep 17 00:00:00 2001 From: Steve Laing Date: Thu, 14 Nov 2024 14:08:11 +0000 Subject: [PATCH] Add APPLICATION_ID to env Balance up a few inconsistencies across env files. --- .env.e2e | 5 +++-- .env.example | 3 ++- compose.yml | 2 ++ src/functions/status_callback/Dockerfile | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.env.e2e b/.env.e2e index a7fc52e..83f9cb1 100644 --- a/.env.e2e +++ b/.env.e2e @@ -1,9 +1,10 @@ AZURITE_CONNECTION_STRING="DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;" +APPLICATION_ID="" BLOB_CONTAINER_NAME=pilot-data CONTACT_TELEPHONE_NUMBER=0123456789 -NOTIFY_API_KEY="" -NOTIFY_API_KID="" NOTIFY_API_URL=https://sandbox.api.service.nhs.uk NOTIFY_FUNCTION_URL=http://localhost:7072/api/notify/message/send +OAUTH2_API_KEY="" +OAUTH2_API_KID="" OAUTH2_TOKEN_URL="" PRIVATE_KEY="" diff --git a/.env.example b/.env.example index d6d91a3..fdca46e 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,6 @@ # See https://github.com/Azure/Azurite?tab=readme-ov-file#connection-strings AZURITE_CONNECTION_STRING="" +APPLICATION_ID="" BLOB_CONTAINER_NAME=pilot-data CONTACT_TELEPHONE_NUMBER="" NOTIFY_API_URL="" @@ -7,4 +8,4 @@ NOTIFY_FUNCTION_URL="" OAUTH2_API_KEY="" OAUTH2_API_KID="" OAUTH2_TOKEN_URL="" -PRIVATE_KEY_PATH="" +PRIVATE_KEY="" diff --git a/compose.yml b/compose.yml index 0c8afa8..fb432a2 100644 --- a/compose.yml +++ b/compose.yml @@ -63,3 +63,5 @@ services: environment: - AzureWebJobsStorage=UseDevelopmentStorage=true - ASPNETCORE_URLS=http://*:7073 + - APPLICATION_ID=${APPLICATION_ID} + - OAUTH2_API_KEY=${OAUTH2_API_KEY} diff --git a/src/functions/status_callback/Dockerfile b/src/functions/status_callback/Dockerfile index be88046..5d46f7b 100644 --- a/src/functions/status_callback/Dockerfile +++ b/src/functions/status_callback/Dockerfile @@ -6,7 +6,10 @@ ENV AzureWebJobsScriptRoot=/home/site/wwwroot \ AzureFunctionsJobHost__Logging__Console__IsEnabled=true \ AzureWebJobsFeatureFlags=EnableWorkerIndexing \ AzureWebJobsStorage=UseDevelopmentStorage=true \ - FUNCTIONS_WORKER_RUNTIME=python + FUNCTIONS_WORKER_RUNTIME=python \ + APPLICATION_ID=${APPLICATION_ID} \ + OAUTH2_API_KEY = ${OAUTH2_API_KEY} + COPY requirements.txt /