From 438a8a888885d80300e019c5605a5e9c11db490b Mon Sep 17 00:00:00 2001 From: Steve Buxton Date: Thu, 7 May 2026 10:33:01 +0100 Subject: [PATCH 1/6] Use valid IDs in test config --- .../supplier-allocation/supplier1-volumeGroup-test1.json | 4 ++-- .../supplier-allocation/supplier1-volumeGroup-test2.json | 4 ++-- .../supplier-allocation/supplier1-volumeGroup-test3.json | 4 ++-- .../supplier-allocation/supplier2-volumeGroup-test1.json | 4 ++-- config/suppliers/volume-group/volumeGroup-test1.json | 2 +- config/suppliers/volume-group/volumeGroup-test2.json | 2 +- config/suppliers/volume-group/volumeGroup-test3.json | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test1.json b/config/suppliers/supplier-allocation/supplier1-volumeGroup-test1.json index 81a82b31b..5dcc397e0 100644 --- a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test1.json +++ b/config/suppliers/supplier-allocation/supplier1-volumeGroup-test1.json @@ -1,7 +1,7 @@ { "allocationPercentage": 30, - "id": "supplier1-volumeGroup-test1", + "id": "supplier1-volume-group-test1", "status": "PROD", "supplier": "supplier1", - "volumeGroup": "volumeGroup-test1" + "volumeGroup": "volume-group-test1" } diff --git a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test2.json b/config/suppliers/supplier-allocation/supplier1-volumeGroup-test2.json index cada2db0a..257997289 100644 --- a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test2.json +++ b/config/suppliers/supplier-allocation/supplier1-volumeGroup-test2.json @@ -1,7 +1,7 @@ { "allocationPercentage": 100, - "id": "supplier1-volumeGroup-test2", + "id": "supplier1-volume-group-test2", "status": "PROD", "supplier": "supplier1", - "volumeGroup": "volumeGroup-test2" + "volumeGroup": "volume-group-test2" } diff --git a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test3.json b/config/suppliers/supplier-allocation/supplier1-volumeGroup-test3.json index f08467c9f..aabd19088 100644 --- a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test3.json +++ b/config/suppliers/supplier-allocation/supplier1-volumeGroup-test3.json @@ -1,7 +1,7 @@ { "allocationPercentage": 100, - "id": "supplier1-volumeGroup-test3", + "id": "supplier1-volume-group-test3", "status": "PROD", "supplier": "supplier1", - "volumeGroup": "volumeGroup-test3" + "volumeGroup": "volume-group-test3" } diff --git a/config/suppliers/supplier-allocation/supplier2-volumeGroup-test1.json b/config/suppliers/supplier-allocation/supplier2-volumeGroup-test1.json index 9d34abba3..b71dc0186 100644 --- a/config/suppliers/supplier-allocation/supplier2-volumeGroup-test1.json +++ b/config/suppliers/supplier-allocation/supplier2-volumeGroup-test1.json @@ -1,7 +1,7 @@ { "allocationPercentage": 70, - "id": "supplier2-volumeGroup-test1", + "id": "supplier2-volume-group-test1", "status": "PROD", "supplier": "supplier2", - "volumeGroup": "volumeGroup-test1" + "volumeGroup": "volume-group-test1" } diff --git a/config/suppliers/volume-group/volumeGroup-test1.json b/config/suppliers/volume-group/volumeGroup-test1.json index 3b3bab804..46d290691 100644 --- a/config/suppliers/volume-group/volumeGroup-test1.json +++ b/config/suppliers/volume-group/volumeGroup-test1.json @@ -1,6 +1,6 @@ { "description": "Dev Test Volume Group 1", - "id": "volumeGroup-test1", + "id": "volume-group-test1", "name": "Dev Test Volume Group 1", "startDate": "2026-01-01", "status": "PROD" diff --git a/config/suppliers/volume-group/volumeGroup-test2.json b/config/suppliers/volume-group/volumeGroup-test2.json index 0eb829ec2..37ce2d9ba 100644 --- a/config/suppliers/volume-group/volumeGroup-test2.json +++ b/config/suppliers/volume-group/volumeGroup-test2.json @@ -1,6 +1,6 @@ { "description": "Dev Test Volume Group 2", - "id": "volumeGroup-test2", + "id": "volume-group-test2", "name": "Dev Test Volume Group 2", "startDate": "2026-01-01", "status": "PROD" diff --git a/config/suppliers/volume-group/volumeGroup-test3.json b/config/suppliers/volume-group/volumeGroup-test3.json index 650199fe3..14072f492 100644 --- a/config/suppliers/volume-group/volumeGroup-test3.json +++ b/config/suppliers/volume-group/volumeGroup-test3.json @@ -1,6 +1,6 @@ { "description": "Dev Test Volume Group 3", - "id": "volumeGroup-test3", + "id": "volume-group-test3", "name": "Dev Test Volume Group 3", "startDate": "2026-01-01", "status": "PROD" From cea9dc09191f2d4d86918be9a01a4e288bb2fba1 Mon Sep 17 00:00:00 2001 From: Steve Buxton Date: Thu, 7 May 2026 10:36:41 +0100 Subject: [PATCH 2/6] Rename files to match IDs --- ...1-volumeGroup-test1.json => supplier1-volume-group-test1.json} | 0 ...1-volumeGroup-test2.json => supplier1-volume-group-test2.json} | 0 ...1-volumeGroup-test3.json => supplier1-volume-group-test3.json} | 0 ...2-volumeGroup-test1.json => supplier2-volume-group-test1.json} | 0 .../{volumeGroup-test1.json => volume-group-test1.json} | 0 .../{volumeGroup-test2.json => volume-group-test2.json} | 0 .../{volumeGroup-test3.json => volume-group-test3.json} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename config/suppliers/supplier-allocation/{supplier1-volumeGroup-test1.json => supplier1-volume-group-test1.json} (100%) rename config/suppliers/supplier-allocation/{supplier1-volumeGroup-test2.json => supplier1-volume-group-test2.json} (100%) rename config/suppliers/supplier-allocation/{supplier1-volumeGroup-test3.json => supplier1-volume-group-test3.json} (100%) rename config/suppliers/supplier-allocation/{supplier2-volumeGroup-test1.json => supplier2-volume-group-test1.json} (100%) rename config/suppliers/volume-group/{volumeGroup-test1.json => volume-group-test1.json} (100%) rename config/suppliers/volume-group/{volumeGroup-test2.json => volume-group-test2.json} (100%) rename config/suppliers/volume-group/{volumeGroup-test3.json => volume-group-test3.json} (100%) diff --git a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test1.json b/config/suppliers/supplier-allocation/supplier1-volume-group-test1.json similarity index 100% rename from config/suppliers/supplier-allocation/supplier1-volumeGroup-test1.json rename to config/suppliers/supplier-allocation/supplier1-volume-group-test1.json diff --git a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test2.json b/config/suppliers/supplier-allocation/supplier1-volume-group-test2.json similarity index 100% rename from config/suppliers/supplier-allocation/supplier1-volumeGroup-test2.json rename to config/suppliers/supplier-allocation/supplier1-volume-group-test2.json diff --git a/config/suppliers/supplier-allocation/supplier1-volumeGroup-test3.json b/config/suppliers/supplier-allocation/supplier1-volume-group-test3.json similarity index 100% rename from config/suppliers/supplier-allocation/supplier1-volumeGroup-test3.json rename to config/suppliers/supplier-allocation/supplier1-volume-group-test3.json diff --git a/config/suppliers/supplier-allocation/supplier2-volumeGroup-test1.json b/config/suppliers/supplier-allocation/supplier2-volume-group-test1.json similarity index 100% rename from config/suppliers/supplier-allocation/supplier2-volumeGroup-test1.json rename to config/suppliers/supplier-allocation/supplier2-volume-group-test1.json diff --git a/config/suppliers/volume-group/volumeGroup-test1.json b/config/suppliers/volume-group/volume-group-test1.json similarity index 100% rename from config/suppliers/volume-group/volumeGroup-test1.json rename to config/suppliers/volume-group/volume-group-test1.json diff --git a/config/suppliers/volume-group/volumeGroup-test2.json b/config/suppliers/volume-group/volume-group-test2.json similarity index 100% rename from config/suppliers/volume-group/volumeGroup-test2.json rename to config/suppliers/volume-group/volume-group-test2.json diff --git a/config/suppliers/volume-group/volumeGroup-test3.json b/config/suppliers/volume-group/volume-group-test3.json similarity index 100% rename from config/suppliers/volume-group/volumeGroup-test3.json rename to config/suppliers/volume-group/volume-group-test3.json From 113b103e3a5111a4cad09746e880698860e69c28 Mon Sep 17 00:00:00 2001 From: Steve Buxton Date: Wed, 13 May 2026 10:28:21 +0100 Subject: [PATCH 3/6] Rename publish supplier config repo --- .github/workflows/stage-3-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stage-3-build.yaml b/.github/workflows/stage-3-build.yaml index 78f2a0033..ba68ea702 100644 --- a/.github/workflows/stage-3-build.yaml +++ b/.github/workflows/stage-3-build.yaml @@ -211,7 +211,7 @@ jobs: .github/scripts/dispatch_internal_repo_workflow.sh \ --infraRepoName "$(echo ${{ github.repository }} | cut -d'/' -f2)" \ --releaseVersion ${{ github.head_ref || github.ref_name }} \ - --targetWorkflow "publish-supplier-config.yaml" \ + --targetWorkflow "publish-supplier-config-to-ddb.yaml" \ --targetEnvironment "${{ steps.set-environment.outputs.environment_name }}" \ --targetComponent "config" \ --targetAccountGroup "nhs-notify-suppliers-dev" \ From 466ef9f034307aea330d8509294aaa7d89207881 Mon Sep 17 00:00:00 2001 From: Steve Buxton Date: Wed, 13 May 2026 10:32:03 +0100 Subject: [PATCH 4/6] Hardcode internal ref - DO NOT CHECK IN --- .github/workflows/stage-3-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/stage-3-build.yaml b/.github/workflows/stage-3-build.yaml index ba68ea702..01e71f8d4 100644 --- a/.github/workflows/stage-3-build.yaml +++ b/.github/workflows/stage-3-build.yaml @@ -213,6 +213,7 @@ jobs: --releaseVersion ${{ github.head_ref || github.ref_name }} \ --targetWorkflow "publish-supplier-config-to-ddb.yaml" \ --targetEnvironment "${{ steps.set-environment.outputs.environment_name }}" \ + --internalRef "feature/CCM-17337-Publish-Supplier-Configuration-Event" \ --targetComponent "config" \ --targetAccountGroup "nhs-notify-suppliers-dev" \ --tableName "supplier-config" \ From 10a1fa0d9511ad973063a98fb533b683834fc2fd Mon Sep 17 00:00:00 2001 From: Steve Buxton Date: Wed, 13 May 2026 11:15:23 +0100 Subject: [PATCH 5/6] Fix check for table name --- .github/scripts/dispatch_internal_repo_workflow.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/dispatch_internal_repo_workflow.sh b/.github/scripts/dispatch_internal_repo_workflow.sh index 4704f7f16..273325eb8 100755 --- a/.github/scripts/dispatch_internal_repo_workflow.sh +++ b/.github/scripts/dispatch_internal_repo_workflow.sh @@ -224,7 +224,7 @@ if [[ -z "$extraSecretNames" ]]; then extraSecretNames="" fi -if [{ -z "$tableName" }]; then +if [[ -z "$tableName" ]]; then tableName="" fi From 0ab715accff405e6f1e9ee31d08f80f348cdfc96 Mon Sep 17 00:00:00 2001 From: Steve Buxton Date: Wed, 13 May 2026 11:45:12 +0100 Subject: [PATCH 6/6] Fix error logging --- .github/scripts/dispatch_internal_repo_workflow.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/scripts/dispatch_internal_repo_workflow.sh b/.github/scripts/dispatch_internal_repo_workflow.sh index 273325eb8..3e4969d7d 100755 --- a/.github/scripts/dispatch_internal_repo_workflow.sh +++ b/.github/scripts/dispatch_internal_repo_workflow.sh @@ -306,17 +306,21 @@ echo "[INFO] Triggering workflow '$targetWorkflow' in nhs-notify-internal..." echo "[DEBUG] Dispatch event payload: $DISPATCH_EVENT" -trigger_response=$(curl -s -L \ - --fail \ +trigger_http_code=$(curl -s -L \ + -o /tmp/dispatch_response.json \ + -w "%{http_code}" \ -X POST \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer ${PR_TRIGGER_PAT}" \ -H "X-GitHub-Api-Version: 2022-11-28" \ "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/$targetWorkflow/dispatches" \ - -d "$DISPATCH_EVENT" 2>&1) + -d "$DISPATCH_EVENT") -if [[ $? -ne 0 ]]; then - echo "[ERROR] Failed to trigger workflow. Response: $trigger_response" +trigger_response=$(cat /tmp/dispatch_response.json) + +if [[ "$trigger_http_code" -lt 200 || "$trigger_http_code" -ge 300 ]]; then + echo "[ERROR] Failed to trigger workflow. HTTP status: $trigger_http_code" + echo "[ERROR] Response body: $trigger_response" exit 1 fi