Merge pull request #698 from NHSDigital/develop

Merge Fix For Manifest Template To 17.0

Author: nhsd-david-wass

manifest_template.yml

@@ -8,7 +8,6 @@
 APIGEE_ENVIRONMENTS:
 - display_name: Internal Development
   name: internal-dev
-  has_variants: true
   variants:
   - name: alpha
   - name: rc
@@ -25,29 +24,21 @@ APIGEE_ENVIRONMENTS:
     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
-
 
 ACCESS_MODES:
   - name: healthcare-worker
@@ -62,9 +53,7 @@ ACCESS_MODES:
     scopes: ['urn:nhsd:apim:app:level3:e-referrals-service-api']
     requireCallbackUrl: false
     description: Application Restricted
-
 ---
-
 meta:
   api:
     name: e-referrals-service-api
@@ -78,7 +67,7 @@ apigee:
 {% set portal_visibility = ENV.portal_visibility | default(true) %}
 {% set TITLE = 'e-Referral Service' %}
 {% set NAME = 'e-referrals-service-api-' + ENV.name %}
-{% if ENV.has_variants == 'true' %}
+{% if ENV.name == 'internal-dev' or ENV.name == 'dev' %}
   - name: {{ ENV.name }}
     products:
 {% for VARIANT in ENV.variants %}
@@ -110,12 +99,12 @@ apigee:
         proxies:
           - e-referrals-service-api-{{ VARIANT.service | default(VARIANT.name) }}-{{ ENV.name }}
           - identity-service-{{ ENV.name }}
-          { % if ENV.name == 'dev' % }
+{% if ENV.name == 'dev' %}
           - identity-service-dep-{{ ENV.name }}
-          { % endif % }
-          { % if ENV.name == 'internal-dev' % }
+{% endif %}
+{% if ENV.name == 'internal-dev' %}
           - identity-service-mock-{{ ENV.name }}
-          { % endif % }
+{% endif %}
         scopes: {{ MODE.scopes }}
         quota: 600
         quotaInterval: 1