Merge pull request #691 from NHSDigital/develop

ERSSUP-66099 - APIM-R 1.17 Cut

Author: nhsd-david-wass

azure/azure-release-pipeline.yml

@@ -114,6 +114,22 @@ extends:
           smoke_tests: true
       depends_on:
       - manual_approval_int
+    - environment: manual-approval
+      stage_name: manual_approval_dep
+    - environment: dev
+      stage_name: ers_dep_release
+      service_name: "${{ variables.service_name }}-dep"
+      short_service_name: "${{ variables.short_service_name }}-dep"
+      service_base_path: "${{ variables.service_base_path }}-dep"
+      enable_status_monitoring: true
+      jinja_templates:
+        ERS_TARGET_SERVER: e-referrals-service-api--dep
+      post_deploy:
+      - template: templates/run-tests.yml
+        parameters:
+          smoke_tests: true
+      depends_on:
+      - manual_approval_dep
     - environment: prod
       stage_name: prod #revert to ers_prod_release when monitoring stack fixed to support it.
       post_deploy:

manifest_template.yml

@@ -8,34 +8,46 @@
 APIGEE_ENVIRONMENTS:
 - display_name: Internal Development
   name: internal-dev
+  has_variants: true
+  variants:
+  - name: alpha
+  - name: rc
+  - name: fix
+  - name: ft01
+    service: fti
+  - name: ft04
+    service: ftiv
+  - name: ft05
+    service: ftv
+  - name: ft09
+    service: ftix
+  - name: ft22
+    service: ftxxii
 - display_name: Internal Development Sandbox
   name: internal-dev-sandbox
+  has_variants: false
 - display_name:  Integration Testing
   name: int
+  has_variants: false
 - display_name: Internal QA
   name: internal-qa
+  has_variants: false
 - display_name: Internal QA Sandbox
   name: internal-qa-sandbox
+  has_variants: false
 - display_name: Sandbox
   name: sandbox
+  has_variants: false
+- display_name: Dev
+  name: dev
+  has_variants: true
+  variants:
+  - name: dep
 - name: prod
   approval_type: manual
   display_name: Production
+  has_variants: false
 
-INTERNAL_DEV_VARIANTS:
-- name: alpha
-- name: rc
-- name: fix
-- name: ft01
-  service: fti
-- name: ft04
-  service: ftiv
-- name: ft05
-  service: ftv
-- name: ft09
-  service: ftix
-- name: ft22
-  service: ftxxii
 
 ACCESS_MODES:
   - name: healthcare-worker
@@ -66,10 +78,10 @@ apigee:
 {% set portal_visibility = ENV.portal_visibility | default(true) %}
 {% set TITLE = 'e-Referral Service' %}
 {% set NAME = 'e-referrals-service-api-' + ENV.name %}
-{% if ENV.name == 'internal-dev' %}
+{% if ENV.has_variants == 'true' %}
   - name: {{ ENV.name }}
     products:
-{% for VARIANT in INTERNAL_DEV_VARIANTS %}
+{% for VARIANT in ENV.variants %}
 {% for MODE in ACCESS_MODES %}
       - name: e-referrals-service-api-{{ VARIANT.service | default(VARIANT.name) }}-{{ ENV.name }}{{ MODE.nameSuffix }}
         approvalType: {{ ENV.approval_type | default('auto') }}
@@ -98,20 +110,25 @@ apigee:
         proxies:
           - e-referrals-service-api-{{ VARIANT.service | default(VARIANT.name) }}-{{ ENV.name }}
           - identity-service-{{ ENV.name }}
+          { % if ENV.name == 'dev' % }
+          - identity-service-dep-{{ ENV.name }}
+          { % endif % }
+          { % if ENV.name == 'internal-dev' % }
           - identity-service-mock-{{ ENV.name }}
+          { % endif % }
         scopes: {{ MODE.scopes }}
         quota: 600
         quotaInterval: 1
         quotaTimeUnit: minute
 {% endfor %}
 {% endfor %}
     specs:
-{% for VARIANT in INTERNAL_DEV_VARIANTS %}
+{% for VARIANT in ENV.variants %}
       - name: e-referrals-service-api-{{ VARIANT.service | default(VARIANT.name) }}-{{ ENV.name }}
         path: e-referrals-service-api.json
 {% endfor %}
     api_catalog:
-{% for VARIANT in INTERNAL_DEV_VARIANTS %}
+{% for VARIANT in ENV.variants %}
 {% for MODE in ACCESS_MODES %}
       - edgeAPIProductName: e-referrals-service-api-{{ VARIANT.service | default(VARIANT.name) }}-{{ ENV.name }}{{ MODE.nameSuffix }}
         anonAllowed: true