Merge branch 'main' into aea-6515-stateful-cdk

Author: tstephen-nhs

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
     "args": {
       "DOCKER_GID": "${env:DOCKER_GID:}",
       "IMAGE_NAME": "node_24_python_3_12",
-      "IMAGE_VERSION": "v1.4.4",
+      "IMAGE_VERSION": "v1.4.8",
       "USER_UID": "${localEnv:USER_ID:}",
       "USER_GID": "${localEnv:GROUP_ID:}"
     },

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       verify_published_from_main_image: true
 
   quality_checks:
-    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@c8f899f30a6a726859b0277faa73cd9ff7f4de20
+    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8399c1f015c1304e40771cbd8ccc24c7ed48fdbc
     needs: [get_config_values]
     permissions:
       contents: read

.github/workflows/pull_request.yml

@@ -27,7 +27,7 @@ jobs:
       verify_published_from_main_image: false
 
   quality_checks:
-    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@c8f899f30a6a726859b0277faa73cd9ff7f4de20
+    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8399c1f015c1304e40771cbd8ccc24c7ed48fdbc
     needs: [get_config_values]
     permissions:
       contents: read

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       verify_published_from_main_image: true
   quality_checks:
-    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@c8f899f30a6a726859b0277faa73cd9ff7f4de20
+    uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8399c1f015c1304e40771cbd8ccc24c7ed48fdbc
     needs: [get_config_values]
     permissions:
       contents: read
@@ -415,7 +415,7 @@ jobs:
       ENABLE_POST_DATED_NOTIFICATIONS: false
       ENABLED_SYSTEMS: "CrxPatientApp"
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
-      ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
+      ENABLED_SUPPLIER_APPLICATION_IDS: "30c8d461-e875-4882-85d1-4d5d90f7f17b,f7a08809-09f5-4215-a5c8-e280705aba77,401b11d1-5608-4d6e-8359-9bbed6c90e7e,4b2d703f-d8bb-4c82-8340-b1a97481a46a,9331742d-ccc3-4081-b54b-22e8f946a1ce,ee353200-2b8f-47be-8b70-d0777e80d92f"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c" # INT and PROD share a value
       NOTIFY_API_BASE_URL: "https://api.service.nhs.uk"
       MTLS_KEY: psu-mtls-1

SAMtemplates/functions/main.yaml

@@ -137,7 +137,7 @@ Resources:
           SQS_SALT: !Ref SQSSaltSecret
           # Remove this once we've confirmed that product ID based filtering is working as expected and we
           # no longer need the ability to switch back to the old filtering method
-          USE_APP_ID_FOR_NOTIFICATIONS_FILTERING: false
+          USE_APP_ID_FOR_NOTIFICATIONS_FILTERING: true
           ENABLED_SYSTEMS_PARAM: !Ref EnabledSystemsParam
           #
           ENABLED_APPLICATION_IDS_PARAM: !Ref EnabledSupplierApplicationIDsParam