Merge branch 'main' into feature/eja-eli-510-add-CSOC-api-log-forwarding

Author: eddalmond1

.github/workflows/base-deploy.yml

@@ -154,7 +154,7 @@ jobs:
               --region eu-west-2
 
         - name: "Upload lambda artifact for the current workflow"
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v5
           with:
             name: lambda-${{ needs.metadata.outputs.tag }}
             path: ./dist/lambda.zip
@@ -182,7 +182,7 @@ jobs:
           terraform_version: ${{ needs.metadata.outputs.terraform_version }}
 
       - name: "Download Lambda Artifact"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: lambda-${{ needs.metadata.outputs.tag }}
           path: ./dist

.github/workflows/cicd-2-publish.yaml

@@ -82,7 +82,7 @@ jobs:
           make build
 
       - name: "Upload lambda artefact for cross-workflow use"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: lambda-${{ needs.metadata.outputs.version }}
           path: dist/lambda.zip

.github/workflows/cicd-3-test-deploy.yaml

@@ -74,7 +74,7 @@ jobs:
           aws-region: eu-west-2
 
       - name: "Download lambda artefact from dev workflow"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: lambda-${{ needs.metadata.outputs.tag }}
           path: ./dist

.github/workflows/sonarcube-scan-main-branch.yaml

@@ -28,7 +28,7 @@ jobs:
         run: |
           make test-unit
       - name: "Save the coverage check result"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: coverage.xml
           path: coverage.xml
@@ -41,7 +41,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Get the coverage report"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: coverage.xml
       - name: Run static analysis script

.github/workflows/stage-1-commit.yaml

@@ -101,7 +101,7 @@ jobs:
           output_format: sarif
           output_file_path: checkov-report.sarif
       - name: Upload Checkov results to GitHub Security tab
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: checkov_results
           path: checkov-report.sarif

.github/workflows/stage-2-test.yaml

@@ -48,7 +48,7 @@ jobs:
         run: |
           make test-unit
       - name: "Save the coverage check result"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: coverage.xml
           path: coverage.xml
@@ -83,7 +83,7 @@ jobs:
         with:
           fetch-depth: 0 # Full history is needed to improving relevancy of reporting
       - name: "Get the coverage report"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: coverage.xml
       - name: "Perform static analysis"

.github/workflows/stage-3-build.yaml

@@ -49,7 +49,7 @@ jobs:
           make dependencies install-python
           make build
       - name: "Upload lambda artefact"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: lambda
           path: dist/lambda.zip

.github/workflows/stage-4-acceptance.yaml

@@ -120,7 +120,7 @@ jobs:
         with:
           python-version: '3.13'
       - name: "Get lambda artefact"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: lambda
           path: dist
@@ -132,13 +132,13 @@ jobs:
           echo "Nothing to save"
       - name: Upload Integration Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: integration-test-results
           path: integration-test-results.xml
       - name: Gather Integration Test Summaries
         if: always()
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           path: summary
           pattern: ci-summary-*

poetry.lock

@@ -44,9 +44,9 @@ jsonpath-rw = "^1.4.0"
 semver = "^3.0.4"
 gitpython = "^3.1.45"
 pytest = "^8.4.1"
-pytest-asyncio = "^1.1.0"
+pytest-asyncio = "^1.2.0"
 pytest-cov = "^7.0.0"
-pytest-nhsd-apim = "^5.0.4"
+pytest-nhsd-apim = "^5.0.14"
 aiohttp = "^3.12.15"
 awscli = "^1.37.24"
 awscli-local = "^0.22.0"
@@ -60,7 +60,7 @@ pytest-freezer = "^0.4.9"
 moto = "^5.1.13"
 requests = "^2.32.5"
 jsonschema = "^4.25.1"
-behave = "^1.2.6"
+behave = "^1.3.3"
 python-dotenv = "^1.1.1"
 openapi-spec-validator = "^0.7.2"
 pip-licenses = "^5.0.0"