From dddb10065ca797958a3bededffd974e914ee3462 Mon Sep 17 00:00:00 2001
From: Simon K <6615834+simon-20@users.noreply.github.com>
Date: Mon, 27 Jul 2026 16:27:04 +0100
Subject: [PATCH 1/5] feat: add explanatory text, timestamps

Add explanatory text, add timestamps to indices, and bring footer up to date.
---
 web/404.html            |  48 ++++++++++++----
 web/index-template.html | 121 ++++++++++++++++++++++++++++++++++------
 2 files changed, 143 insertions(+), 26 deletions(-)

diff --git a/web/404.html b/web/404.html
index d1f2bba..1093c2f 100644
--- a/web/404.html
+++ b/web/404.html
@@ -66,24 +66,52 @@ <h1>404 - Page or file not found</h1>
 
   <footer class="iati-footer iati-brand-background">
     <div class="iati-brand-background__content">
+      <div class="iati-footer__section">
+        <div class="iati-footer__container">
+          <div class="iati-footer-block">
+            <h2 class="iati-footer-block__title">Additional Information</h2>
+            <div class="iati-footer-block__content iati-footer-block__content--columns">
+              <div>
+                <p>Part of the IATI Unified Platform.</p>
+                <p>
+                  Code licensed under
+                  <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">GNU AGPL</a>.
+                </p>
+                <p>
+                  Documentation licensed under
+                  <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 3.0</a>.
+                </p>
+              </div>
+              <div>
+                <ul>
+                  <li><a href="https://github.com/IATI/bulk-data-service">Bulk Data Service Code</a></li>
+                </ul>
+              </div>
+            </div>
+            Please report bugs and request features using <a
+              href="https://github.com/IATI/bulk-data-service/issues">GitHub issues</a> or via <a
+              href="https://iatistandard.org/en/guidance/get-support/">IATI Support</a>.
+          </div>
+        </div>
+      </div>
 
       <div class="iati-footer__section iati-footer__section--last">
         <div class="iati-footer__container">
           <nav>
             <ul class="iati-piped-list iati-footer__legal-nav">
-              <li><a href="https://iatistandard.org/en/privacy-policy/">Privacy</a></li>
-              <li><a href="https://iatistandard.org/en/data-removal/">Data removal</a></li>
-              <li><span>&copy; Copyright IATI 2025</span></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/privacy-policy/">Privacy</a></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/cookie-policy/">Cookies</a></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/copyright/">Copyright</a></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/data-removal/">Data Removal</a></li>
             </ul>
           </nav>
+          <div class="iati-footer__actions">
 
-          <div class="iati-country-switcher">
-            <label for="iati-country-switcher-footer" class="iati-country-switcher__label">Choose your language</label>
-            <select id="iati-country-switcher-footer" class="iati-country-switcher__control">
-              <option>English</option>
-            </select>
+            <a href="#" class="iati-button iati-button--light hide--mobile-nav">
+              <span>Feedback</span>
+              <i class="iati-icon iati-icon--feedback"></i>
+            </a>
           </div>
-
           <div class="iati-footer__social">
             <a href="https://www.linkedin.com/company/international-aid-transparency-initiative/" aria-label="LinkedIn">
               <i class="iati-icon iati-icon--linkedin"></i>
@@ -94,7 +122,7 @@ <h1>404 - Page or file not found</h1>
             <a href="https://www.youtube.com/channel/UCAVH1gcgJXElsj8ENC-bDQQ" aria-label="YouTube">
               <i class="iati-icon iati-icon--youtube"></i>
             </a>
-            <a href="https://www.facebook.com/IATIaid" aria-label="Facebook">
+            <a href="https://www.facebook.com/IATIaid/" aria-label="Facebook">
               <i class="iati-icon iati-icon--facebook"></i>
             </a>
           </div>
diff --git a/web/index-template.html b/web/index-template.html
index 5ca98a1..2e85fab 100644
--- a/web/index-template.html
+++ b/web/index-template.html
@@ -5,6 +5,17 @@
   <meta charset="UTF-8">
   <title>IATI Bulk Data Service</title>
   <link href="https://cdn.jsdelivr.net/npm/iati-design-system@4.9.0/dist/css/iati.min.css" rel="stylesheet" />
+  <style>
+    /* Unstyled layout table, used only to align the "Last updated" column.
+       The class also exempts it from the design system's table:not([class]) rules. */
+    .links-table td {
+      padding: 0 2rem 0.5rem 0;
+      /* The design system gives <a> a line-height of 2, which the plain text in
+         the second column doesn't get; align on the text baseline, not the box. */
+      vertical-align: baseline;
+      line-height: 2;
+    }
+  </style>
 </head>
 
 <body class="iati-design-system--enabled">
@@ -39,7 +50,8 @@
                 <option>English</option>
               </select>
             </div>
-            <button class="iati-button iati-button--light hide--mobile-nav" onclick="window.location.assign('https://docs.unified-platform.iatistandard.org/en/latest/bulk-data-service/')">
+            <button class="iati-button iati-button--light hide--mobile-nav"
+              onclick="window.location.assign('https://docs.unified-platform.iatistandard.org/en/latest/bulk-data-service/')">
               <span>Help Docs</span>
               <i class="iati-icon iati-icon--info"></i>
             </button>
@@ -57,39 +69,115 @@
   </div>
 
   <main class="iati-main">
+    <p>
+      The Bulk Data Service runs on a continuous basis to maintain a copy of
+      every dataset registered with IATI. Changes to published data can be
+      reflected in as little as an hour, but may take up to 24 hours depending on
+      the reporting organisation's technical configuration.
+    </p>
     <p>
       You can download IATI data from this service, in the packages below. The
       first three packages contain indices of the data, and the last package is a
       ZIP file containing all the data files.
     </p>
 
-    <h1>Links</h1>
-    <p><a href="/datasets-minimal">IATI Dataset Index - Minimal (JSON)</a></p>
-    <p><a href="/datasets-full">IATI Dataset Index - Full (JSON)</a></p>
-    <p><a href="/reporting-orgs">IATI Reporting Orgs Index (JSON)</a></p>
-    <p><a href="/iati-data.zip">IATI Bulk Data Download ZIP</a></p>
+    <h2>Links</h2>
+    <table class="links-table">
+      <tbody>
+        <tr>
+          <td><a href="{{WEB_BASE_URL}}/datasets-minimal">IATI Dataset Index - Minimal (JSON)</a></td>
+          <td id="datasetsMinimalLastUpdated"></td>
+        </tr>
+        <tr>
+          <td><a href="{{WEB_BASE_URL}}/datasets-full">IATI Dataset Index - Full (JSON)</a></td>
+          <td id="datasetsFullLastUpdated"></td>
+        </tr>
+        <tr>
+          <td><a href="{{WEB_BASE_URL}}/reporting-orgs">IATI Reporting Orgs Index (JSON)</a></td>
+          <td id="reportingOrgsLastUpdated"></td>
+        </tr>
+        <tr>
+          <td><a href="{{WEB_BASE_URL}}/iati-data.zip">IATI Bulk Data Download ZIP</a></td>
+          <td></td>
+        </tr>
+      </tbody>
+    </table>
+
+    <script>
+      (function () {
+        var files = [
+          { elementId: 'datasetsMinimalLastUpdated', label: 'Last updated: ', url: '/datasets-minimal' },
+          { elementId: 'datasetsFullLastUpdated', label: 'Last updated: ', url: '/datasets-full' },
+          { elementId: 'reportingOrgsLastUpdated', label: 'Last updated: ', url: '/reporting-orgs' }
+        ];
+        files.forEach(function (f) {
+          var el = document.getElementById(f.elementId);
+          fetch(f.url)
+            .then(function (r) {
+              if (!r.ok) { throw new Error(r.status + ' ' + r.statusText); }
+              return r.json();
+            })
+            .then(function (data) {
+              if (el) { el.textContent = f.label + (data.index_created || 'Unknown'); }
+            })
+            .catch(function (err) {
+              if (el) { el.textContent = f.label + 'Unavailable'; }
+              console.warn('Could not fetch ' + f.url + ': ' + err.message);
+            });
+        });
+      })();
+    </script>
   </main>
 
   <footer class="iati-footer iati-brand-background">
     <div class="iati-brand-background__content">
+      <div class="iati-footer__section">
+        <div class="iati-footer__container">
+          <div class="iati-footer-block">
+            <h2 class="iati-footer-block__title">Additional Information</h2>
+            <div class="iati-footer-block__content iati-footer-block__content--columns">
+              <div>
+                <p>Part of the IATI Unified Platform.</p>
+                <p>
+                  Code licensed under
+                  <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">GNU AGPL</a>.
+                </p>
+                <p>
+                  Documentation licensed under
+                  <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 3.0</a>.
+                </p>
+              </div>
+              <div>
+                <ul>
+                  <li><a href="https://github.com/IATI/bulk-data-service">Bulk Data Service
+                      {{BULK_DATA_SERVICE_VERSION}}</a></li>
+                </ul>
+              </div>
+            </div>
+            Please report bugs and request features using <a
+              href="https://github.com/IATI/bulk-data-service/issues">GitHub issues</a> or via <a
+              href="https://iatistandard.org/en/guidance/get-support/">IATI Support</a>.
+          </div>
+        </div>
+      </div>
 
       <div class="iati-footer__section iati-footer__section--last">
         <div class="iati-footer__container">
           <nav>
             <ul class="iati-piped-list iati-footer__legal-nav">
-              <li><a href="https://iatistandard.org/en/privacy-policy/">Privacy</a></li>
-              <li><a href="https://iatistandard.org/en/data-removal/">Data removal</a></li>
-              <li><span>&copy; Copyright IATI 2025</span></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/privacy-policy/">Privacy</a></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/cookie-policy/">Cookies</a></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/copyright/">Copyright</a></li>
+              <li><a href="https://web-terms.iatistandard.org/en/latest/data-removal/">Data Removal</a></li>
             </ul>
           </nav>
+          <div class="iati-footer__actions">
 
-          <div class="iati-country-switcher">
-            <label for="iati-country-switcher-footer" class="iati-country-switcher__label">Choose your language</label>
-            <select id="iati-country-switcher-footer" class="iati-country-switcher__control">
-              <option>English</option>
-            </select>
+            <a href="#" class="iati-button iati-button--light hide--mobile-nav">
+              <span>Feedback</span>
+              <i class="iati-icon iati-icon--feedback"></i>
+            </a>
           </div>
-
           <div class="iati-footer__social">
             <a href="https://www.linkedin.com/company/international-aid-transparency-initiative/" aria-label="LinkedIn">
               <i class="iati-icon iati-icon--linkedin"></i>
@@ -100,7 +188,7 @@ <h1>Links</h1>
             <a href="https://www.youtube.com/channel/UCAVH1gcgJXElsj8ENC-bDQQ" aria-label="YouTube">
               <i class="iati-icon iati-icon--youtube"></i>
             </a>
-            <a href="https://www.facebook.com/IATIaid" aria-label="Facebook">
+            <a href="https://www.facebook.com/IATIaid/" aria-label="Facebook">
               <i class="iati-icon iati-icon--facebook"></i>
             </a>
           </div>
@@ -108,6 +196,7 @@ <h1>Links</h1>
       </div>
     </div>
   </footer>
+
 </body>
 
 </html>
\ No newline at end of file

From ba92c3b5a50c6b33638d55e3ecf275b387535010 Mon Sep 17 00:00:00 2001
From: Simon K <6615834+simon-20@users.noreply.github.com>
Date: Mon, 27 Jul 2026 16:29:57 +0100
Subject: [PATCH 2/5] ci: update build script w/BDS version, healthcheck

---
 .github/workflows/build-and-deploy-job.yml    | 37 ++++++++++---------
 .github/workflows/test.yml                    | 10 +++++
 .../generate-index-from-template.sh           | 17 +++++++++
 azure-provision/azure-create-resources.sh     |  2 +-
 tests-local-environment/docker-compose.yml    |  8 +++-
 .../wait-for-mq-emulator.sh                   | 32 ++++++++++++++++
 6 files changed, 85 insertions(+), 21 deletions(-)
 create mode 100755 azure-deployment/generate-index-from-template.sh
 create mode 100755 tests-local-environment/wait-for-mq-emulator.sh

diff --git a/.github/workflows/build-and-deploy-job.yml b/.github/workflows/build-and-deploy-job.yml
index bad60f9..56fad67 100644
--- a/.github/workflows/build-and-deploy-job.yml
+++ b/.github/workflows/build-and-deploy-job.yml
@@ -28,7 +28,7 @@ jobs:
       AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
     steps:
-      - name: 'Generate/build derived environment variables'
+      - name: "Generate/build derived environment variables"
         run: |
           echo "TARGET_ENVIRONMENT_UPPER=${TARGET_ENVIRONMENT^^}" >> ${GITHUB_ENV}
           echo "CONTAINER_INSTANCE_BASE_NAME=aci-${APP_NAME}" >> ${GITHUB_ENV}
@@ -37,7 +37,7 @@ jobs:
           echo "APP_NAME=${APP_NAME}" >> ${GITHUB_ENV}
           echo "AZURE_SUBSCRIPTION_ID=${AZURE_SUBSCRIPTION_ID}" >> ${GITHUB_ENV}
 
-      - name: 'Print calculated environment variables'
+      - name: "Print calculated environment variables"
         run: |
           echo $TARGET_ENVIRONMENT_UPPER
           echo $CONTAINER_INSTANCE_BASE_NAME
@@ -45,45 +45,46 @@ jobs:
           echo $STORAGE_ACCOUNT_NAME
           echo $APP_NAME
           echo $AZURE_SUBSCRIPTION_ID
-      - name: 'Checkout GitHub Action'
+
+      - name: "Checkout GitHub Action"
         uses: actions/checkout@v4
 
-      - name: 'Login via Azure CLI'
+      - name: "Login via Azure CLI"
         uses: azure/login@v2
         with:
           creds: ${{ secrets[format('{0}_{1}', env.TARGET_ENVIRONMENT_UPPER, 'AZURE_CREDENTIALS')] }}
 
-      - name: 'Login to Docker Hub'
+      - name: "Login to Docker Hub"
         uses: docker/login-action@v3.2.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
-      - name: 'Login to Azure Container Registry'
+      - name: "Login to Azure Container Registry"
         uses: azure/docker-login@v2
         with:
           login-server: ${{ env.ACR_LOGIN_SERVER }}
           username: ${{ env.ACR_USERNAME }}
           password: ${{ env.ACR_PASSWORD }}
 
-      - name: 'Build and push image'
+      - name: "Build and push image"
         run: |
           IMAGE_NAME=$ACR_LOGIN_SERVER/$APP_NAME-$TARGET_ENVIRONMENT:$DOCKER_IMAGE_TAG
           echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
           docker build . -f Dockerfile -t $IMAGE_NAME
           docker push $IMAGE_NAME
 
-      - name: 'Print IMAGE_NAME for Bulk Data Service image'
+      - name: "Print IMAGE_NAME for Bulk Data Service image"
         run: echo $IMAGE_NAME
 
-      - name: 'Create htpasswd file for nginx reverse proxy'
+      - name: "Create htpasswd file for nginx reverse proxy"
         run: |
           htpasswd -BC 10 -c -b ./azure-deployment/nginx-reverse-proxy/htpasswd prom "${{ secrets.PROM_NGINX_REVERSE_PROXY_PASSWORD }}"
           docker build ./azure-deployment/nginx-reverse-proxy -t criati.azurecr.io/bds-prom-nginx-reverse-proxy-$TARGET_ENVIRONMENT:$DOCKER_IMAGE_TAG
           docker push criati.azurecr.io/bds-prom-nginx-reverse-proxy-$TARGET_ENVIRONMENT:$DOCKER_IMAGE_TAG
 
-      - name: 'Delete existing container group'
-        uses: 'azure/CLI@v2'
+      - name: "Delete existing container group"
+        uses: "azure/CLI@v2"
         with:
           inlineScript: |
             az -v
@@ -91,7 +92,7 @@ jobs:
               --name "${{ env.CONTAINER_INSTANCE_BASE_NAME }}-${{ env.TARGET_ENVIRONMENT }}" \
               --resource-group "${{ env.RESOURCE_GROUP_BASE_NAME }}-${{ env.TARGET_ENVIRONMENT }}"
 
-      - name: 'Replace Env Vars and Secrets in ARM Yaml template'
+      - name: "Replace Env Vars and Secrets in ARM Yaml template"
         env:
           # Secrets / credentials for the app's resources
           AZURE_SERVICE_BUS_CONNECTION_STRING: ${{ secrets[format('{0}_{1}', env.TARGET_ENVIRONMENT_UPPER, 'AZURE_SERVICE_BUS_CONNECTION_STRING')] }}
@@ -136,8 +137,8 @@ jobs:
         run: |
           ./azure-deployment/generate-manifest-from-template.sh
 
-      - name: 'Deploy group to Azure Container Instances'
-        uses: 'azure/CLI@v2'
+      - name: "Deploy group to Azure Container Instances"
+        uses: "azure/CLI@v2"
         with:
           inlineScript: |
             az -v
@@ -145,15 +146,15 @@ jobs:
             --resource-group "${{ env.RESOURCE_GROUP_BASE_NAME }}-${{ env.TARGET_ENVIRONMENT }}" \
             --file ./azure-deployment/azure-resource-manager-deployment-manifest.yml
 
-      - name: 'Re-generate the website links'
+      - name: "Re-generate the website links"
         env:
           WEB_BASE_URL: ${{ vars[format('{0}_{1}', env.TARGET_ENVIRONMENT_UPPER, 'WEB_BASE_URL')] }}
 
         run: |
-          sed -e "s#{{WEB_BASE_URL}}#$WEB_BASE_URL#" web/index-template.html > web/index.html
+          ./azure-deployment/generate-index-from-template.sh
 
-      - name: 'Update the website'
-        uses: 'azure/CLI@v2'
+      - name: "Update the website"
+        uses: "azure/CLI@v2"
         with:
           inlineScript: |
             az storage blob upload-batch -s web -d '$web' --account-name $STORAGE_ACCOUNT_NAME --overwrite
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 97113bf..d8ee58b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,5 +27,15 @@ jobs:
     - name: Run docker-compose
       run: cd ./tests-local-environment; docker compose up -d
 
+    # The Service Bus emulator has no docker compose healthcheck (its image is
+    # distroless), so `docker compose up -d` returns before it is accepting AMQP
+    # connections. Without this gate the MQ integration tests race its startup.
+    - name: Wait for Service Bus emulator
+      run: ./tests-local-environment/wait-for-mq-emulator.sh
+
     - name: Run automated tests
       run: pytest
+
+    - name: Docker compose logs (on failure)
+      if: failure()
+      run: cd ./tests-local-environment; docker compose logs --no-color
diff --git a/azure-deployment/generate-index-from-template.sh b/azure-deployment/generate-index-from-template.sh
new file mode 100755
index 0000000..5be532a
--- /dev/null
+++ b/azure-deployment/generate-index-from-template.sh
@@ -0,0 +1,17 @@
+#!/bin/env bash
+
+# This script is not intended to be run directly.
+# It is run by the generic 'build-and-deploy' Github action, and by
+# 'azure-provision/azure-create-resources.sh', so that both paths generate
+# an identical web/index.html.
+#
+# Expects WEB_BASE_URL in the environment. BULK_DATA_SERVICE_VERSION is read
+# from pyproject.toml unless already set. Must be run from the repo root.
+
+BULK_DATA_SERVICE_VERSION="${BULK_DATA_SERVICE_VERSION:-$(python3 -c "import tomllib; print(tomllib.load(open('pyproject.toml','rb'))['project']['version'])")}"
+
+echo "Generating web/index.html (version ${BULK_DATA_SERVICE_VERSION}, base URL ${WEB_BASE_URL})"
+
+sed -e "s#{{WEB_BASE_URL}}#${WEB_BASE_URL}#" \
+    -e "s#{{BULK_DATA_SERVICE_VERSION}}#${BULK_DATA_SERVICE_VERSION}#" \
+    ./web/index-template.html > ./web/index.html
diff --git a/azure-provision/azure-create-resources.sh b/azure-provision/azure-create-resources.sh
index 5e55a8c..61edce9 100755
--- a/azure-provision/azure-create-resources.sh
+++ b/azure-provision/azure-create-resources.sh
@@ -178,7 +178,7 @@ AZURE_BASE_URL=$(az storage account show -n "$STORAGE_ACCOUNT_NAME" -g "$RESOURC
 AZURE_BASE_HOSTNAME="$(sed "s#https://\(.*\)/#\1#" <<< $AZURE_BASE_URL)"
 
 # WEB_BASE_URL is calculated above from TARGET_ENVIRONMENT, bearing in mind 'prod' doesn't have prefix
-sed -e "s#{{WEB_BASE_URL}}#$WEB_BASE_URL#" web/index-template.html > web/index.html
+./azure-deployment/generate-index-from-template.sh
 
 echo "Uploading index and 404 pages to storage account..."
 az storage blob upload-batch -s web -d '$web' --account-name $STORAGE_ACCOUNT_NAME --overwrite
diff --git a/tests-local-environment/docker-compose.yml b/tests-local-environment/docker-compose.yml
index 95ea3d9..867ee91 100644
--- a/tests-local-environment/docker-compose.yml
+++ b/tests-local-environment/docker-compose.yml
@@ -60,8 +60,12 @@ services:
       bds-local-test-net:
 
   bds-test-env-mq-emulator:
-    image: mcr.microsoft.com/azure-messaging/servicebus-emulator:latest
-    pull_policy: always
+    # NOTE: The emulator version is pinned deliberately. The `latest` tag moved
+    #       to 2.0.1 in July 2026, which broke CI (the emulator takes long
+    #       enough to start that the tests raced it), and 2.x carries an open
+    #       bug where sends hang despite the emulator reporting healthy:
+    #       https://github.com/Azure/azure-service-bus-emulator-installer/issues/135
+    image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
     volumes:
       # NOTE: The local dev docker compose environment and the local test docker
       #       compose environment use the same Azure Service Bus configuration
diff --git a/tests-local-environment/wait-for-mq-emulator.sh b/tests-local-environment/wait-for-mq-emulator.sh
new file mode 100755
index 0000000..bb32455
--- /dev/null
+++ b/tests-local-environment/wait-for-mq-emulator.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+# Waits for the Azure Service Bus emulator to report itself healthy.
+#
+# The emulator exposes a health API (GET /health, which returns 503 while the
+# emulator is starting up and 200 when ready). This can't be a docker compose
+# healthcheck because the emulator image is distroless. See:
+#   https://github.com/Azure/azure-service-bus-emulator-installer/issues/88
+
+# So we poll the health API from the host instead.
+#
+# Usage: wait-for-mq-emulator.sh [health-url] [timeout-seconds]
+#
+# The default URL is the local test environment (host port 5301). For the local
+# development docker compose environment, pass http://localhost:5300/health
+
+set -euo pipefail
+
+HEALTH_URL="${1:-http://localhost:5301/health}"
+TIMEOUT_SECONDS="${2:-120}"
+
+deadline=$((SECONDS + TIMEOUT_SECONDS))
+
+until curl --fail --silent --show-error "${HEALTH_URL}" >/dev/null 2>&1; do
+	if ((SECONDS >= deadline)); then
+		echo "Service Bus emulator did not become healthy within ${TIMEOUT_SECONDS}s: ${HEALTH_URL}" >&2
+		exit 1
+	fi
+	sleep 2
+done
+
+echo "Service Bus emulator is healthy (${HEALTH_URL})"

From 264b6d2b67101c8fdfb001136f721ab487b84335 Mon Sep 17 00:00:00 2001
From: Simon K <6615834+simon-20@users.noreply.github.com>
Date: Mon, 27 Jul 2026 16:30:13 +0100
Subject: [PATCH 3/5] docs: update README w/test healthcheck, CHANGELOG

---
 CHANGELOG.md | 16 ++++++++++++++++
 README.md    | 13 +++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8019a8..cc54ca6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ### Removed
 
+## [1.4.10] - 2026-07-27
+
+### Changed
+
+ - Expanded explanatory text, added 'Last updated: ' for the indices, and
+   brought IATI footer up to date.
+ - Pinned the Azure Service Bus emulator to version 1.1.2 in the local
+   development and test docker compose setups, rather than tracking `latest`.
+
+### Fixed
+
+ - Fixed intermittent CI test failures caused by a race condition due to the
+   tests sometimes starting before the Azure Service Bus emulator was ready: CI
+   now waits for the emulator's health API before running the tests, and dumps
+   the docker compose logs if the tests fail.
+
 ## [1.4.9] - 2026-05-25
 
 ### Fixed
diff --git a/README.md b/README.md
index fedeecb..995c6bd 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,19 @@ docker compose up --remove-orphans
 
 _Note: the `--remove-orphans` just helps keep things clean as you develop, and alter the setup._
 
+The Azure Service Bus emulator takes a while to start, and `docker compose`
+cannot wait for it because the emulator image is distroless. Running the tests
+before it is ready causes the MQ integration tests to fail with connection
+errors, so wait for it with:
+
+```
+./tests-local-environment/wait-for-mq-emulator.sh
+```
+
+(For the local development docker compose setup, rather than the test setup,
+pass the dev environment's health URL:
+`./tests-local-environment/wait-for-mq-emulator.sh http://localhost:5300/health`)
+
 Once this is running, run the tests with:
 
 ```

From a784713410c213d2a5e95991b234f3c3e897698a Mon Sep 17 00:00:00 2001
From: Simon K <6615834+simon-20@users.noreply.github.com>
Date: Mon, 27 Jul 2026 20:14:14 +0100
Subject: [PATCH 4/5] build: pin Azure ServiceBus eumulator

---
 docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 20a0192..c47fdf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,8 +52,9 @@ services:
       bds-local-dev-net:
 
   bds-local-dev-mq-emulator:
-    image: mcr.microsoft.com/azure-messaging/servicebus-emulator:latest
-    pull_policy: always
+    # NOTE: The emulator version is pinned deliberately; see the note in
+    #       tests-local-environment/docker-compose.yml for why.
+    image: mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2
     volumes:
       # NOTE: The local dev docker compose environment and the local test docker
       #       compose environment use the same Azure Service Bus configuration

From e52d11496ddb218e50116ab1855d921e447e7ee7 Mon Sep 17 00:00:00 2001
From: Simon K <6615834+simon-20@users.noreply.github.com>
Date: Mon, 27 Jul 2026 16:31:21 +0100
Subject: [PATCH 5/5] build: bump version - 1.4.10

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index a6b6bc4..db44f72 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "bulk-data-service"
-version = "1.4.9"
+version = "1.4.10"
 requires-python = ">= 3.12.6"
 readme = "README.md"
 dependencies = [