From bb665060fc88daa960b3332c168bf53fec43abe6 Mon Sep 17 00:00:00 2001 From: Lambodar Padhy Date: Mon, 15 Sep 2025 14:10:28 +0100 Subject: [PATCH 1/2] NHSO-61032: Dep proxy in dev enviornment --- azure/azure-release-pipeline.yml | 3 +++ manifest_template.yml | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/azure/azure-release-pipeline.yml b/azure/azure-release-pipeline.yml index 69210a6..88dd074 100644 --- a/azure/azure-release-pipeline.yml +++ b/azure/azure-release-pipeline.yml @@ -38,6 +38,9 @@ extends: - environment: internal-dev - environment: internal-qa - environment: dev + service_name: "${{ variables.service_name }}-dep" + short_service_name: "${{ variables.short_service_name }}-dep" + service_base_path: "${{ variables.service_base_path }}-dep" depends_on: - internal_qa - environment: int diff --git a/manifest_template.yml b/manifest_template.yml index 9538dff..d2ee87d 100644 --- a/manifest_template.yml +++ b/manifest_template.yml @@ -26,7 +26,7 @@ APIGEE_ENVIRONMENTS: - name: prod display_name: Production approval_type: manual - make_spec_visible: true + make_spec_visible: true quota: 60000 appQuota: 24000 --- @@ -42,7 +42,7 @@ apigee: {% for ENV in APIGEE_ENVIRONMENTS %} {% set TITLE = 'NHS App (' + ENV.display_name + ')' %} {% set DESCRIPTION = 'NHS App - ' + ENV.display_name | lower + ' environment' %} -{% set NAME = 'nhs-app-' + ENV.name %} +{% set NAME = 'nhs-app-' + ('dep-' if ENV.name == 'dev' else '') + ENV.name %} - name: {{ ENV.name }} products: - name: {{ NAME }} @@ -68,8 +68,8 @@ apigee: displayName: {{ TITLE }} environments: [ {{ ENV.name }} ] proxies: - - nhs-app-{{ ENV.name }} - - identity-service-{{ ENV.name }} + - nhs-app-{{ ('dep-' if ENV.name == 'dev' else '') + ENV.name }} + - identity-service-{{ ('dep-' if ENV.name == 'dev' else '') + ENV.name}} {% if ENV.name == 'int' %} - identity-service-int-no-smartcard {% endif %} From cdfd4965c4b2ae023a1068fcff9651d48a35739e Mon Sep 17 00:00:00 2001 From: Lambodar Padhy Date: Mon, 15 Sep 2025 15:02:17 +0100 Subject: [PATCH 2/2] NHSO-61032: Add DEP to display name --- manifest_template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest_template.yml b/manifest_template.yml index d2ee87d..e8ca105 100644 --- a/manifest_template.yml +++ b/manifest_template.yml @@ -13,7 +13,7 @@ APIGEE_ENVIRONMENTS: display_name: Internal QA make_spec_visible: true - name: dev - display_name: External Development + display_name: External Development DEP make_spec_visible: true - name: int display_name: Integration Testing