Merge pull request #2537 from NHSDigital/develop

Author: sudhanshu-arya1

.github/workflows/combine-prs.yml

@@ -41,7 +41,7 @@ jobs:
 
         # Steps represent a sequence of tasks that will be executed as part of the job
         steps:
-            - uses: actions/github-script@v7
+            - uses: actions/github-script@v8
               id: create-combined-pr
               name: Create Combined PR
               with:

.github/workflows/continous-integration-workflow.yaml

@@ -13,7 +13,7 @@ jobs:
           fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
 
       - name: Install Python 3.10
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.10'
 

macros/manifest_macros.yml

@@ -3,12 +3,14 @@
     products:
 {% endmacro %}
 
-{%- macro product(ENV, MODE, TITLE, product_name, display_name) -%}
+{%- macro product(ENV, MODE, TITLE, product_name, display_name, euo_allowlist_required) -%}
       - name: e-referrals-service-api-{{ product_name }}{{ MODE.nameSuffix }}
         approvalType: {{ ENV.approval_type | default('auto') }}
         attributes:
           - name: access
             value: public
+          - name: EUOAllowlistRequired
+            value: {{ euo_allowlist_required }}
           - name: ratelimiting
             value:
               e-referrals-service-api-{{ product_name }}:

manifest_template.yml

@@ -16,23 +16,31 @@ APIGEE_ENVIRONMENTS:
   variants:
   - name: rc-internal-dev
     display_name: Internal Development - rc
+    euo_allowlist_required: false
   - name: fix-internal-dev
     display_name: Internal Development - fix
+    euo_allowlist_required: false
   - name: fti-internal-dev
     display_name: Internal Development - ft01
+    euo_allowlist_required: false
   - name: ftiv-internal-dev
     display_name: Internal Development - ft04
+    euo_allowlist_required: false
   - name: ftv-internal-dev
     display_name: Internal Development - ft05
+    euo_allowlist_required: false
   - name: ftix-internal-dev
     display_name: Internal Development - ft09
+    euo_allowlist_required: false
   - name: ftxxii-internal-dev
     display_name: Internal Development - ft22
+    euo_allowlist_required: false
 
 - name: internal-dev-sandbox
   variants:
     - name: internal-dev-sandbox
       display_name: Internal Development Sandbox
+      euo_allowlist_required: false
 
 - name: int
   additional_proxies:
@@ -41,6 +49,7 @@ APIGEE_ENVIRONMENTS:
   variants:
     - name: int
       display_name: Integration Testing
+      euo_allowlist_required: false
 
 - name: internal-qa
   additional_proxies:
@@ -49,29 +58,34 @@ APIGEE_ENVIRONMENTS:
   variants:
     - name: internal-qa
       display_name: Internal QA
+      euo_allowlist_required: false
 
 - name: internal-qa-sandbox
   variants:
     - name: internal-qa-sandbox
       display_name: Internal QA Sandbox
+      euo_allowlist_required: false
 
 - name: sandbox
   variants:
     - name: sandbox
       display_name: Sandbox
+      euo_allowlist_required: false
 
 - name: dev
   additional_proxies:
     - identity-service-dep-dev
   variants:
   - name: dep-dev
     display_name: Dev - dep
+    euo_allowlist_required: false
 
 - name: prod
   approval_type: manual
   variants:
     - name: prod
       display_name: Production
+      euo_allowlist_required: false
 
 ACCESS_MODES:
   - name: healthcare-worker
@@ -104,7 +118,7 @@ apigee:
 
 {%    for VARIANT in ENV.variants %}
 {%      for MODE in ACCESS_MODES %}
-      {{ macros.product(ENV, MODE, TITLE, VARIANT.name, VARIANT.display_name) }}
+      {{ macros.product(ENV, MODE, TITLE, VARIANT.name, VARIANT.display_name, VARIANT.euo_allowlist_required) }}
 {%      endfor %}
 {%    endfor %}