Skip to content

Chore: [AEA-0000] - Default to using the app ID. Populate the parameter with the enabled suppliers #2970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wildjames merged 2 commits into from
Apr 16, 2026
Merged

Chore: [AEA-0000] - Default to using the app ID. Populate the parameter with the enabled suppliers #2970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da3b98b
Default to using the app ID. Populate the parameter with the enabled …
wildjames Apr 16, 2026
1ded1b8
Merge branch 'main' into aea-0000-define-allowed-supplier-ids-in-code
wildjames Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SAMtemplates/functions/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines 138 to 139
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment above this flag refers to confirming “product ID based filtering” and switching back to the “old filtering method”, but the flag is specifically about using application IDs for filtering. Please update/remove the comment so it accurately describes the current behaviour and what the rollback path actually is.

Suggested change
# 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
# Keep this flag while application ID based filtering remains behind a rollback switch.
# Set to false to revert to the legacy notifications filtering behaviour.

Copilot uses AI. Check for mistakes.
USE_APP_ID_FOR_NOTIFICATIONS_FILTERING: false
USE_APP_ID_FOR_NOTIFICATIONS_FILTERING: true
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

USE_APP_ID_FOR_NOTIFICATIONS_FILTERING is being set as a YAML boolean. Lambda environment variable values are strings, and the TypeScript code reads this from process.env as a string; relying on implicit coercion here is fragile and can fail schema/type validation in CloudFormation/SAM. Set the value explicitly as a string (e.g., "true").

Suggested change
USE_APP_ID_FOR_NOTIFICATIONS_FILTERING: true
USE_APP_ID_FOR_NOTIFICATIONS_FILTERING: "true"

Copilot uses AI. Check for mistakes.
ENABLED_SYSTEMS_PARAM: !Ref EnabledSystemsParam
#
ENABLED_APPLICATION_IDS_PARAM: !Ref EnabledSupplierApplicationIDsParam
Expand Down
Loading