Skip to content

Commit 8cf0f93

Browse files
wildjameswildjames
committed
Add non-empty defaults for the new parameter
1 parent 0516e2d commit 8cf0f93

5 files changed

Lines changed: 24 additions & 4 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ jobs:
8181
ENABLE_POST_DATED_NOTIFICATIONS: true
8282
ENABLED_SYSTEMS: "Internal Test System"
8383
BLOCKED_SITE_ODS_CODES: "B3J1Z"
84+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
8485
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
8586
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
8687
MTLS_KEY: psu-mtls-1
@@ -124,6 +125,7 @@ jobs:
124125
ENABLE_POST_DATED_NOTIFICATIONS: true
125126
ENABLED_SYSTEMS: "Internal Test System"
126127
BLOCKED_SITE_ODS_CODES: "B3J1Z"
128+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX" # Workaround empty string handling
127129
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
128130
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
129131
MTLS_KEY: psu-mtls-1
@@ -135,7 +137,8 @@ jobs:
135137
PROXYGEN_ROLE: ${{ secrets.PROXYGEN_PTL_ROLE }}
136138

137139
release_qa:
138-
needs: [tag_release, release_dev, package_code, get_commit_id, get_config_values]
140+
needs:
141+
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
139142
uses: ./.github/workflows/run_release_code_and_api.yml
140143
with:
141144
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -164,6 +167,7 @@ jobs:
164167
ENABLE_POST_DATED_NOTIFICATIONS: true
165168
ENABLED_SYSTEMS: "Internal Test System"
166169
BLOCKED_SITE_ODS_CODES: "B3J1Z"
170+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX" # Workaround empty string handling
167171
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
168172
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
169173
MTLS_KEY: psu-mtls-1

‎.github/workflows/pull_request.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118
ENABLE_POST_DATED_NOTIFICATIONS: true
119119
ENABLED_SYSTEMS: "Internal Test System"
120120
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
121+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
121122
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
122123
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
123124
MTLS_KEY: psu-mtls-1
@@ -159,6 +160,7 @@ jobs:
159160
ENABLE_NOTIFICATIONS_EXTERNAL: false
160161
ENABLED_SYSTEMS: "Internal Test System"
161162
BLOCKED_SITE_ODS_CODES: "B3J1Z"
163+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX" # Workaround empty string handling
162164
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
163165
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
164166
MTLS_KEY: psu-mtls-1

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
jira_release_prefix: "psu"
4545
secrets:
4646
EXECUTE_JIRA_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
47-
4847

4948
package_code:
5049
needs: [tag_release, get_config_values]
@@ -83,6 +82,7 @@ jobs:
8382
ENABLE_POST_DATED_NOTIFICATIONS: true
8483
ENABLED_SYSTEMS: "Internal Test System"
8584
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
85+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
8686
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
8787
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
8888
MTLS_KEY: psu-mtls-1
@@ -129,6 +129,7 @@ jobs:
129129
ENABLE_POST_DATED_NOTIFICATIONS: false
130130
ENABLED_SYSTEMS: "Internal Test System"
131131
BLOCKED_SITE_ODS_CODES: "B3J1Z"
132+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
132133
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
133134
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
134135
MTLS_KEY: psu-mtls-1
@@ -181,6 +182,7 @@ jobs:
181182
ENABLE_POST_DATED_NOTIFICATIONS: false
182183
ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
183184
BLOCKED_SITE_ODS_CODES: "B3J1Z"
185+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
184186
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
185187
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
186188
MTLS_KEY: psu-mtls-1
@@ -233,6 +235,7 @@ jobs:
233235
ENABLE_POST_DATED_NOTIFICATIONS: true
234236
ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
235237
BLOCKED_SITE_ODS_CODES: "B3J1Z"
238+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
236239
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
237240
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
238241
MTLS_KEY: psu-mtls-1
@@ -248,7 +251,8 @@ jobs:
248251
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
249252

250253
release_int:
251-
needs: [tag_release, release_qa, package_code, get_commit_id, get_config_values]
254+
needs:
255+
[tag_release, release_qa, package_code, get_commit_id, get_config_values]
252256
uses: ./.github/workflows/run_release_code_and_api.yml
253257
with:
254258
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -277,6 +281,7 @@ jobs:
277281
ENABLE_POST_DATED_NOTIFICATIONS: true
278282
ENABLED_SYSTEMS: "CrxPatientApp"
279283
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
284+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
280285
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
281286
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
282287
MTLS_KEY: psu-mtls-1
@@ -296,7 +301,8 @@ jobs:
296301
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
297302

298303
release_int_sandbox:
299-
needs: [tag_release, release_qa, package_code, get_commit_id, get_config_values]
304+
needs:
305+
[tag_release, release_qa, package_code, get_commit_id, get_config_values]
300306
uses: ./.github/workflows/run_release_code_and_api.yml
301307
with:
302308
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -323,6 +329,7 @@ jobs:
323329
ENABLE_POST_DATED_NOTIFICATIONS: false
324330
ENABLED_SYSTEMS: "Internal Test System, Apotec Ltd - Apotec CRM - Production, CrxPatientApp, nhsPrescriptionApp, Titan PSU Prod"
325331
BLOCKED_SITE_ODS_CODES: "B3J1Z"
332+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
326333
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c"
327334
NOTIFY_API_BASE_URL: "https://int.api.service.nhs.uk"
328335
MTLS_KEY: psu-mtls-1
@@ -375,6 +382,7 @@ jobs:
375382
ENABLE_POST_DATED_NOTIFICATIONS: false
376383
ENABLED_SYSTEMS: "CrxPatientApp"
377384
BLOCKED_SITE_ODS_CODES: "XXXXX" # Workaround empty string handling
385+
ENABLED_SUPPLIER_PRODUCT_IDS: "XXXXX"
378386
NOTIFY_ROUTING_PLAN_ID: "e57fe5cc-0567-4854-abe2-b7dd9014a50c" # INT and PROD share a value
379387
NOTIFY_API_BASE_URL: "https://api.service.nhs.uk"
380388
MTLS_KEY: psu-mtls-1

‎.github/workflows/run_release_code_and_api.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ on:
8585
BLOCKED_SITE_ODS_CODES:
8686
required: true
8787
type: string
88+
ENABLED_SUPPLIER_PRODUCT_IDS:
89+
required: true
90+
type: string
8891
NOTIFY_ROUTING_PLAN_ID:
8992
required: true
9093
type: string
@@ -216,6 +219,7 @@ jobs:
216219
ENABLED_SITE_ODS_CODES: ${{ steps.read.outputs.ods_csv }}
217220
ENABLED_SYSTEMS: ${{ inputs.ENABLED_SYSTEMS }}
218221
BLOCKED_SITE_ODS_CODES: ${{ inputs.BLOCKED_SITE_ODS_CODES }}
222+
ENABLED_SUPPLIER_PRODUCT_IDS: ${{ inputs.ENABLED_SUPPLIER_PRODUCT_IDS }}
219223
NOTIFY_ROUTING_PLAN_ID: ${{ inputs.NOTIFY_ROUTING_PLAN_ID }}
220224
NOTIFY_API_BASE_URL: ${{ inputs.NOTIFY_API_BASE_URL }}
221225
TEST_PRESCRIPTIONS_1: ${{ inputs.TEST_PRESCRIPTIONS_1 || 'noval' }}

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ sam-sync: guard-AWS_DEFAULT_PROFILE guard-stack_name compile
4848
"EnabledSystemsValue=$${ENABLED_SYSTEMS:-Internal Test System}" \
4949
"EnabledSiteODSCodesValue=$${ENABLED_SITE_ODS_CODES:-A83008,FA565}" \
5050
BlockedSiteODSCodesValue=$${BLOCKED_SITE_ODS_CODES:-XXXXX} \
51+
EnabledSupplierProductIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
5152
NotifyRoutingPlanIDValue=$${NOTIFY_ROUTING_PLAN_ID:-e57fe5cc-0567-4854-abe2-b7dd9014a50c} \
5253
NotifyAPIBaseURLValue=$${NOTIFY_API_BASE_URL:-https://int.api.service.nhs.uk} \
5354
EnableNotificationsInternal=$${ENABLE_NOTIFICATIONS_INTERNAL:-true} \
@@ -80,6 +81,7 @@ sam-deploy: guard-AWS_DEFAULT_PROFILE guard-stack_name
8081
"EnabledSystemsValue=$${ENABLED_SYSTEMS:-Internal Test System}" \
8182
"EnabledSiteODSCodesValue=$${ENABLED_SITE_ODS_CODES:-A83008,FA565}" \
8283
BlockedSiteODSCodesValue=$${BLOCKED_SITE_ODS_CODES:-XXXXX} \
84+
EnabledSupplierProductIDsValue=$${ENABLED_SUPPLIER_PRODUCT_IDS:-XXXXX} \
8385
NotifyRoutingPlanIDValue=$${NOTIFY_ROUTING_PLAN_ID:-e57fe5cc-0567-4854-abe2-b7dd9014a50c} \
8486
NotifyAPIBaseURLValue=$${NOTIFY_API_BASE_URL:-https://int.api.service.nhs.uk} \
8587
EnableNotificationsInternal=$${ENABLE_NOTIFICATIONS_INTERNAL:-true} \

0 commit comments

Comments
 (0)