Merge branch 'master' into VED-687-Search-API-no-return-for-RSV

# Conflicts:
#	.github/workflows/sonarcloud.yml

Author: nhsdevws

.github/workflows/pr-lint.yaml

@@ -1,27 +1,30 @@
 name: PR Quality Check
-on: pull_request
+on:
+  pull_request:
+    types: [opened]
+
 jobs:
   link-ticket:
     runs-on: ubuntu-latest
     steps:
       - name: Check ticket name conforms to requirements
-        run: echo ${{ github.event.pull_request.head.ref }} | grep -i -E -q "(amb-[0-9]+)|(ambspii-[0-9]+)|(adz-[0-9]+)|(amb-[0-9]+)|(dependabot\/)"
+        run: echo ${{ github.event.pull_request.head.ref }} | grep -i -E -q "(amb-[0-9]+)|(ambspii-[0-9]+)|(adz-[0-9]+)|(ved-[0-9]+)|(dependabot\/)"
         continue-on-error: true
 
       - name: Grab ticket name
-        if: contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-') || contains(github.event.pull_request.head.ref, 'ambspii-') || contains(github.event.pull_request.head.ref, 'AMBSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-')
-        run: echo ::set-env name=TICKET_NAME::$(echo ${{ github.event.pull_request.head.ref }} | grep -i -o '\(amb-[0-9]\+\)\|\(ambspii-[0-9]\+\)\|\(adz-[0-9]\+\)|\(amb-[0-9]\+\)' | tr '[:lower:]' '[:upper:]')
+        if: contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-') || contains(github.event.pull_request.head.ref, 'ambspii-') || contains(github.event.pull_request.head.ref, 'AMBSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'ved-') || contains(github.event.pull_request.head.ref, 'VED-')
+        run: echo "TICKET_NAME=$(echo ${{ github.event.pull_request.head.ref }} | grep -i -o '\(amb-[0-9]\+\)\|\(ambspii-[0-9]\+\)\|\(adz-[0-9]\+\)\|\(ved-[0-9]\+\)' | tr '[:lower:]' '[:upper:]')" >> $GITHUB_ENV
         continue-on-error: true
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
       - name: Comment on PR with link to JIRA ticket
-        if: contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-') || contains(github.event.pull_request.head.ref, 'ambspii-') || contains(github.event.pull_request.head.ref, 'AMBSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-')
+        if: contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-') || contains(github.event.pull_request.head.ref, 'ambspii-') || contains(github.event.pull_request.head.ref, 'AMBSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'ved-') || contains(github.event.pull_request.head.ref, 'VED-')
         continue-on-error: true
         uses: unsplash/comment-on-pr@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           msg: |
-            This branch is work on a ticket in the NHS Digital AMB JIRA Project. Here's a handy link to the ticket:
+            This branch is working on a ticket in the NHS England VED JIRA Project. Here's a handy link to the ticket:
             # [${{ env.TICKET_NAME }}](https://nhsd-jira.digital.nhs.uk/browse/${{ env.TICKET_NAME}})

.github/workflows/sonarcloud.yml

@@ -21,6 +21,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Install poetry
+        run: pip install poetry==2.1.4
+
       - name: Debug PR Info
         if: github.event_name == 'pull_request'
         run: |
@@ -63,6 +66,7 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.11
+          cache: 'poetry'
 
       - name: Set up AWS credentials
         env:
@@ -72,9 +76,6 @@ jobs:
           aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID
           aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY
 
-      - name: Install poetry
-        run: pip install poetry==2.1.2
-
       - name: Run unittest with filenameprocessor-coverage
         working-directory: filenameprocessor
         id: filenameprocessor

ack_backend/Dockerfile

@@ -3,7 +3,7 @@ FROM public.ecr.aws/lambda/python:3.11 AS base
 RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:1001::/home/appuser:/sbin/nologin' >> /etc/passwd && \
     echo 'appuser:x:1001:' >> /etc/group && \
-    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.2"
+    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
 COPY poetry.lock pyproject.toml README.md ./
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main

backend/batch.Dockerfile

@@ -3,7 +3,7 @@ FROM public.ecr.aws/lambda/python:3.11 AS base
 RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:1001::/home/appuser:/sbin/nologin' >> /etc/passwd && \
     echo 'appuser:x:1001:' >> /etc/group && \
-    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.2"
+    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
 # -----------------------------
 COPY poetry.lock pyproject.toml README.md ./

backend/lambda.Dockerfile

@@ -4,7 +4,7 @@ FROM public.ecr.aws/lambda/python:3.11 as base
 RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:1001::/home/appuser:/sbin/nologin' >> /etc/passwd && \
     echo 'appuser:x:1001:' >> /etc/group && \
-    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.2"
+    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
 # -----------------------------
 COPY poetry.lock pyproject.toml README.md ./

delta_backend/Dockerfile

@@ -4,7 +4,7 @@ FROM public.ecr.aws/lambda/python:3.11 AS base
 RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:1001::/home/appuser:/sbin/nologin' >> /etc/passwd && \
     echo 'appuser:x:1001:' >> /etc/group && \
-    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.2"
+    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
 
 

filenameprocessor/Dockerfile

@@ -4,7 +4,7 @@ FROM public.ecr.aws/lambda/python:3.11 AS base
 RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:1001::/home/appuser:/sbin/nologin' >> /etc/passwd && \
     echo 'appuser:x:1001:' >> /etc/group && \
-    chown -R 1001:1001 /home/appuser &&  pip install "poetry~=2.1.2"
+    chown -R 1001:1001 /home/appuser &&  pip install "poetry~=2.1.4"
 
 # Install Poetry as root
 COPY poetry.lock pyproject.toml README.md ./

filenameprocessor/batch.Dockerfile

@@ -1,6 +1,6 @@
 FROM public.ecr.aws/lambda/python:3.11 as base
 
-RUN pip install "poetry~=2.1.2"
+RUN pip install "poetry~=2.1.4"
 
 COPY poetry.lock pyproject.toml README.md ./
 RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --no-root --only main

lambdas/id_sync/Dockerfile

@@ -4,7 +4,7 @@ FROM public.ecr.aws/lambda/python:3.11 AS base
 RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:1001::/home/appuser:/sbin/nologin' >> /etc/passwd && \
     echo 'appuser:x:1001:' >> /etc/group && \
-    chown -R 1001:1001 /home/appuser && pip install "poetry~=1.5.0"
+    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
 # Install Poetry dependencies
 # Copy id_sync Poetry files

recordprocessor/Dockerfile

@@ -4,7 +4,7 @@ FROM public.ecr.aws/lambda/python:3.11 AS base
 RUN mkdir -p /home/appuser && \
     echo 'appuser:x:1001:1001::/home/appuser:/sbin/nologin' >> /etc/passwd && \
     echo 'appuser:x:1001:' >> /etc/group && \
-    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.2"
+    chown -R 1001:1001 /home/appuser && pip install "poetry~=2.1.4"
 
 # Install Poetry as root
 COPY poetry.lock pyproject.toml README.md ./