From ff25709ef6afd0274da481fd09e6df0611835237 Mon Sep 17 00:00:00 2001
From: chrisbloe <kris.bloe2@nhs.net>
Date: Sun, 29 Mar 2026 23:17:48 +0100
Subject: [PATCH 1/2] [PRM-764] Tweaks to fix broken services

---
 services/mesh-forwarder/Pipfile      |  1 +
 services/mesh-forwarder/Pipfile.lock | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/services/mesh-forwarder/Pipfile b/services/mesh-forwarder/Pipfile
index f8efee9e..93c0229a 100644
--- a/services/mesh-forwarder/Pipfile
+++ b/services/mesh-forwarder/Pipfile
@@ -26,6 +26,7 @@ mypy = "~=1.19.1"
 types-requests = "~=2.33.0"
 requests = "~=2.33.0"
 click = "~=8.3.1"
+urllib3 = "~=2.6.3"
 
 [requires]
 python_version = "3.14.3"
diff --git a/services/mesh-forwarder/Pipfile.lock b/services/mesh-forwarder/Pipfile.lock
index 9e629f46..f605d8fb 100644
--- a/services/mesh-forwarder/Pipfile.lock
+++ b/services/mesh-forwarder/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "aadc12dbb1d704f98300678a3a72adcab2299d9768670a38f2be7c63d609240c"
+            "sha256": "abaad443dd0f0bb91551d18175071b47ae6ac2b4858aab749e5d41820977d751"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -18,19 +18,19 @@
     "default": {
         "boto3": {
             "hashes": [
-                "sha256:95eb3ef693068586f70ca3f29c43701c34a9a73d0df413ea7eaff138efa4a6b9",
-                "sha256:c6d9b05e5b86767d4c6ef762f155c891366e5951162f71d030e109fe531f4fd9"
+                "sha256:480a34a077484a5ca60124dfd150ba3ea6517fc89963a679e45b30c6db614d26",
+                "sha256:cef2ebdb9be5c0e96822f8d3941ac4b816c90a5737a7ffb901d664c808964b63"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==1.42.77"
+            "version": "==1.42.78"
         },
         "botocore": {
             "hashes": [
-                "sha256:807bc2c3825bec6f025506ceeba5f7f111a00de8d58f35c679ee16c8ff6e7b10",
-                "sha256:cbb0ac410fab4aa0839a521329f970b271ec298d67465ed7fa7d095c0dad9f48"
+                "sha256:038ab63c7f898e8b5db58cb6a45e4da56c31dd984e7e995839a3540c735564ea",
+                "sha256:61cbd49728e23f68cfd945406ab40044d49abed143362f7ffa4a4f4bd4311791"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==1.42.77"
+            "version": "==1.42.78"
         },
         "certifi": {
             "hashes": [
@@ -337,19 +337,19 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:95eb3ef693068586f70ca3f29c43701c34a9a73d0df413ea7eaff138efa4a6b9",
-                "sha256:c6d9b05e5b86767d4c6ef762f155c891366e5951162f71d030e109fe531f4fd9"
+                "sha256:480a34a077484a5ca60124dfd150ba3ea6517fc89963a679e45b30c6db614d26",
+                "sha256:cef2ebdb9be5c0e96822f8d3941ac4b816c90a5737a7ffb901d664c808964b63"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==1.42.77"
+            "version": "==1.42.78"
         },
         "botocore": {
             "hashes": [
-                "sha256:807bc2c3825bec6f025506ceeba5f7f111a00de8d58f35c679ee16c8ff6e7b10",
-                "sha256:cbb0ac410fab4aa0839a521329f970b271ec298d67465ed7fa7d095c0dad9f48"
+                "sha256:038ab63c7f898e8b5db58cb6a45e4da56c31dd984e7e995839a3540c735564ea",
+                "sha256:61cbd49728e23f68cfd945406ab40044d49abed143362f7ffa4a4f4bd4311791"
             ],
             "markers": "python_version >= '3.9'",
-            "version": "==1.42.77"
+            "version": "==1.42.78"
         },
         "certifi": {
             "hashes": [

From 463e552f22241a58e6358eaf8aef79d830c56275 Mon Sep 17 00:00:00 2001
From: chrisbloe <kris.bloe2@nhs.net>
Date: Mon, 30 Mar 2026 10:47:21 +0100
Subject: [PATCH 2/2] Upgrade Python version to 3.14 in Dockerfile and GitHub
 Actions workflow

---
 .github/workflows/base-python-service-jobs.yml | 6 +++---
 services/mesh-forwarder/Dockerfile             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/base-python-service-jobs.yml b/.github/workflows/base-python-service-jobs.yml
index 5f04c0d1..312704ec 100644
--- a/.github/workflows/base-python-service-jobs.yml
+++ b/.github/workflows/base-python-service-jobs.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.14
       - name: Run Unit tests
         run: |
           ./tasks test_unit
@@ -56,10 +56,10 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.14
         uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.14
 
       - name: Configure AWS credentials
         id: auth
diff --git a/services/mesh-forwarder/Dockerfile b/services/mesh-forwarder/Dockerfile
index 77f57a3f..408598f2 100644
--- a/services/mesh-forwarder/Dockerfile
+++ b/services/mesh-forwarder/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-alpine3.22
+FROM python:3.14-alpine3.23
 
 RUN apk update && \
     apk -u list && \