Chore: [AEA-6571] - remove app name filtering

.github/scripts/release_code.sh

@@ -68,7 +68,6 @@ sam deploy \
             EnableNotificationsExternal="$ENABLE_NOTIFICATIONS_EXTERNAL" \
             EnabledSiteODSCodesValue="${ENABLED_SITE_ODS_CODES:-' '}" \
             EnablePostDatedNotifications="$ENABLE_POST_DATED_NOTIFICATIONS" \
-            EnabledSystemsValue="${ENABLED_SYSTEMS:-' '}" \
             EnabledSupplierApplicationIDsValue="${ENABLED_SUPPLIER_APPLICATION_IDS:-' '}" \
             BlockedSiteODSCodesValue="${BLOCKED_SITE_ODS_CODES:-' '}" \
             NotifyRoutingPlanIDValue="$NOTIFY_ROUTING_PLAN_ID" \

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: merge to main workflow
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
 
 permissions: {}
 
@@ -52,7 +52,7 @@ jobs:
       tag_format: ${{ needs.get_config_values.outputs.tag_format }}
 
   package_code:
-    needs: [tag_release, get_config_values]
+    needs: [ tag_release, get_config_values ]
     uses: ./.github/workflows/run_package_code_and_api.yml
     permissions:
       contents: read
@@ -62,7 +62,7 @@ jobs:
       pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
 
   release_dev:
-    needs: [tag_release, package_code, get_commit_id, get_config_values]
+    needs: [ tag_release, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -93,7 +93,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: true
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: true
-      ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -111,7 +110,7 @@ jobs:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
 
   release_sandbox_dev:
-    needs: [tag_release, package_code, get_commit_id, get_config_values]
+    needs: [ tag_release, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -140,7 +139,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: true
-      ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX" # Workaround empty string handling
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -154,8 +152,7 @@ jobs:
       PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
 
   release_qa:
-    needs:
-      [tag_release, release_dev, package_code, get_commit_id, get_config_values]
+    needs: [ tag_release, release_dev, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -185,7 +182,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: true
-      ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX" # Workaround empty string handling
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"

.github/workflows/pull_request.yml

@@ -1,7 +1,7 @@
 name: deploy_pr
 on:
   pull_request:
-    branches: [main]
+    branches: [ main ]
 permissions: {}
 jobs:
   get_config_values:
@@ -74,7 +74,7 @@ jobs:
         run: |
           echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
   package_code:
-    needs: [get_issue_number, get_config_values]
+    needs: [ get_issue_number, get_config_values ]
     uses: ./.github/workflows/run_package_code_and_api.yml
     permissions:
       contents: read
@@ -83,7 +83,7 @@ jobs:
     with:
       pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
   release_code:
-    needs: [get_issue_number, package_code, get_commit_id, get_config_values]
+    needs: [ get_issue_number, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -114,7 +114,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: true
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: true
-      ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -131,7 +130,7 @@ jobs:
       PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
   release_sandbox_code:
-    needs: [get_issue_number, package_code, get_commit_id, get_config_values]
+    needs: [ get_issue_number, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -158,7 +157,6 @@ jobs:
       ENABLE_BACKUP: "False"
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
-      ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX" # Workaround empty string handling
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       verify_published_from_main_image: true
   quality_checks:
     uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@b83cff6a2951a8a2951b8c00a7734edd0cc832d3
-    needs: [get_config_values]
+    needs: [ get_config_values ]
     permissions:
       contents: read
       id-token: write
@@ -37,7 +37,7 @@ jobs:
           echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
 
   tag_release:
-    needs: [quality_checks, get_commit_id, get_config_values]
+    needs: [ quality_checks, get_commit_id, get_config_values ]
     uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@b83cff6a2951a8a2951b8c00a7734edd0cc832d3
     permissions:
       id-token: write
@@ -54,7 +54,7 @@ jobs:
       EXECUTE_JIRA_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
 
   package_code:
-    needs: [tag_release, get_config_values]
+    needs: [ tag_release, get_config_values ]
     uses: ./.github/workflows/run_package_code_and_api.yml
     permissions:
       contents: read
@@ -64,7 +64,7 @@ jobs:
       pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
 
   release_dev:
-    needs: [tag_release, package_code, get_commit_id, get_config_values]
+    needs: [ tag_release, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -95,7 +95,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: true
-      ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -117,7 +116,7 @@ jobs:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
 
   release_dev_sandbox:
-    needs: [tag_release, package_code, get_commit_id, get_config_values]
+    needs: [ tag_release, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -145,7 +144,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: false
-      ENABLED_SYSTEMS: "Internal Test System"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -163,15 +161,7 @@ jobs:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
 
   release_ref:
-    needs:
-      [
-        tag_release,
-        release_dev,
-        release_dev_sandbox,
-        package_code,
-        get_commit_id,
-        get_config_values,
-      ]
+    needs: [ tag_release, release_dev, release_dev_sandbox, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -201,7 +191,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: false
-      ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -219,15 +208,7 @@ jobs:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
 
   release_qa:
-    needs:
-      [
-        tag_release,
-        release_dev,
-        release_dev_sandbox,
-        package_code,
-        get_commit_id,
-        get_config_values,
-      ]
+    needs: [ tag_release, release_dev, release_dev_sandbox, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -257,7 +238,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: true
-      ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -275,8 +255,7 @@ jobs:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
 
   release_int:
-    needs:
-      [tag_release, release_qa, package_code, get_commit_id, get_config_values]
+    needs: [ tag_release, release_qa, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -306,7 +285,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: true
       ENABLE_NOTIFICATIONS_EXTERNAL: true
       ENABLE_POST_DATED_NOTIFICATIONS: true
-      ENABLED_SYSTEMS: "CrxPatientApp,nhsPrescriptionApp"
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
       # See https://nhsd-confluence.digital.nhs.uk/spaces/APIMC/pages/1345218865/Mapping+of+Suppliers+to+APIM+Onboarding+Portal+Apps
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX,YYYYY"
@@ -329,8 +307,7 @@ jobs:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
 
   release_int_sandbox:
-    needs:
-      [tag_release, release_qa, package_code, get_commit_id, get_config_values]
+    needs: [ tag_release, release_qa, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -358,7 +335,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: false
       ENABLE_NOTIFICATIONS_EXTERNAL: false
       ENABLE_POST_DATED_NOTIFICATIONS: false
-      ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
       BLOCKED_SITE_ODS_CODES: "B3J1Z"
       ENABLED_SUPPLIER_APPLICATION_IDS: "XXXXX"
       NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
@@ -376,15 +352,7 @@ jobs:
       REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
 
   release_prod:
-    needs:
-      [
-        tag_release,
-        release_int,
-        release_int_sandbox,
-        package_code,
-        get_commit_id,
-        get_config_values,
-      ]
+    needs: [ tag_release, release_int, release_int_sandbox, package_code, get_commit_id, get_config_values ]
     uses: ./.github/workflows/run_release_code_and_api.yml
     permissions:
       contents: write
@@ -414,7 +382,6 @@ jobs:
       ENABLE_NOTIFICATIONS_INTERNAL: true
       ENABLE_NOTIFICATIONS_EXTERNAL: true
       ENABLE_POST_DATED_NOTIFICATIONS: false
-      ENABLED_SYSTEMS: "CrxPatientApp,nhsPrescriptionApp"
       BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
       # See https://nhsd-confluence.digital.nhs.uk/spaces/APIMC/pages/1345218865/Mapping+of+Suppliers+to+APIM+Onboarding+Portal+Apps
       ENABLED_SUPPLIER_APPLICATION_IDS: "ee353200-2b8f-47be-8b70-d0777e80d92f,30c8d461-e875-4882-85d1-4d5d90f7f17b"

.github/workflows/run_release_code_and_api.yml

@@ -79,9 +79,6 @@ on:
         required: false
         type: boolean
         default: false
-      ENABLED_SYSTEMS:
-        required: true
-        type: string
       BLOCKED_SITE_ODS_CODES:
         required: true
         type: string
@@ -231,7 +228,6 @@ jobs:
           ENABLE_POST_DATED_NOTIFICATIONS: ${{ inputs.ENABLE_POST_DATED_NOTIFICATIONS }}
           REQUIRE_APPLICATION_NAME: ${{ inputs.REQUIRE_APPLICATION_NAME }}
           ENABLED_SITE_ODS_CODES: ${{ steps.read.outputs.ods_csv }}
-          ENABLED_SYSTEMS: ${{ inputs.ENABLED_SYSTEMS }}
           BLOCKED_SITE_ODS_CODES: ${{ steps.read.outputs.blocked_ods_csv }}
           ENABLED_SUPPLIER_APPLICATION_IDS: ${{ inputs.ENABLED_SUPPLIER_APPLICATION_IDS }}
           NOTIFY_ROUTING_PLAN_ID: ${{ inputs.NOTIFY_ROUTING_PLAN_ID }}
@@ -264,7 +260,8 @@ jobs:
       - name: Deploy PSU API
         shell: bash
         working-directory: .github/scripts
-        if: ${{ inputs.DEPLOY_APIGEE == true && always() && !failure() && !cancelled() }}
+        if: ${{ inputs.DEPLOY_APIGEE == true && always() && !failure() && !cancelled()
+          }}
         env:
           API_TYPE: standard
           VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
@@ -286,7 +283,8 @@ jobs:
       - name: Deploy CPSU API
         shell: bash
         working-directory: .github/scripts
-        if: ${{ inputs.DEPLOY_APIGEE_CPSU == true && always() && !failure() && !cancelled() }}
+        if: ${{ inputs.DEPLOY_APIGEE_CPSU == true && always() && !failure() &&
+          !cancelled() }}
         env:
           API_TYPE: custom
           VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
@@ -330,7 +328,8 @@ jobs:
           VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
 
   regression_tests:
-    if: ${{ inputs.RUN_REGRESSION_TEST == true && always() && !failure() && !cancelled() }}
+    if: ${{ inputs.RUN_REGRESSION_TEST == true && always() && !failure() &&
+      !cancelled() }}
     name: Regression Tests
     uses: ./.github/workflows/run_regression_tests.yml
     needs: release_code_and_api

Makefile

@@ -45,7 +45,6 @@ sam-sync: guard-AWS_DEFAULT_PROFILE guard-stack_name compile
 			  TestPresciptionsParamValue2=$${TEST_PRESCRIPTIONS_2:-PLACEHOLDER} \
 			  TestPresciptionsParamValue3=$${TEST_PRESCRIPTIONS_3:-PLACEHOLDER} \
 			  TestPresciptionsParamValue4=$${TEST_PRESCRIPTIONS_4:-PLACEHOLDER} \
-			  "EnabledSystemsValue=$${ENABLED_SYSTEMS:-Internal Test System}" \
 			  "EnabledSiteODSCodesValue=$${ENABLED_SITE_ODS_CODES:-A83008,FA565}" \
 			  BlockedSiteODSCodesValue=$${BLOCKED_SITE_ODS_CODES:-XXXXX} \
 			  EnabledSupplierApplicationIDsValue=$${ENABLED_SUPPLIER_APPLICATION_IDS:-XXXXX} \
@@ -78,7 +77,6 @@ sam-deploy: guard-AWS_DEFAULT_PROFILE guard-stack_name
 			  TestPresciptionsParamValue2=$${TEST_PRESCRIPTIONS_2:-PLACEHOLDER} \
 			  TestPresciptionsParamValue3=$${TEST_PRESCRIPTIONS_3:-PLACEHOLDER} \
 			  TestPresciptionsParamValue4=$${TEST_PRESCRIPTIONS_4:-PLACEHOLDER} \
-			  "EnabledSystemsValue=$${ENABLED_SYSTEMS:-Internal Test System}" \
 			  "EnabledSiteODSCodesValue=$${ENABLED_SITE_ODS_CODES:-A83008,FA565}" \
 			  BlockedSiteODSCodesValue=$${BLOCKED_SITE_ODS_CODES:-XXXXX} \
 			  EnabledSupplierApplicationIDsValue=$${ENABLED_SUPPLIER_APPLICATION_IDS:-XXXXX} \

SAMtemplates/functions/main.yaml

@@ -43,9 +43,6 @@ Parameters:
   EnabledSiteODSCodesParam:
     Type: AWS::SSM::Parameter::Name<String>
 
-  EnabledSystemsParam:
-    Type: AWS::SSM::Parameter::Name<String>
-
   EnabledSupplierApplicationIDsParam:
     Type: AWS::SSM::Parameter::Name<String>
 
@@ -135,11 +132,6 @@ Resources:
           POST_DATED_PRESCRIPTIONS_SQS_QUEUE_URL: !Ref PostDatedNotificationsSQSQueueUrl
           ENABLE_POST_DATED_NOTIFICATIONS: !Ref EnablePostDatedNotifications
           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: true
-          ENABLED_SYSTEMS_PARAM: !Ref EnabledSystemsParam
-          #
           ENABLED_APPLICATION_IDS_PARAM: !Ref EnabledSupplierApplicationIDsParam
           ENABLED_SITE_ODS_CODES_PARAM: !Ref EnabledSiteODSCodesParam
           BLOCKED_SITE_ODS_CODES_PARAM: !Ref BlockedSiteODSCodesParam