WIP: test improvements

.github/workflows/cicd-1-pull-request.yaml

@@ -17,16 +17,34 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 1
     steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v6
-      - name: "Verify Jira ticket in PR title and Jira"
-        uses: ./.github/actions/verify-jira-ticket
-        with:
-          pr_title: ${{ github.event.pull_request.title }}
-          pr_branch: ${{ github.head_ref }}
-          jira_token: ${{ secrets.NHS_HOMETEST_JIRA_PAT }}
-          actor: ${{ github.event.pull_request.user.login }}
+      - name: "Check PR title for HOTE- Jira ID"
+        env:
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          PR_BRANCH: ${{ github.head_ref }}
+        run: |
+          JIRA_PATTERN='HOTE-[0-9]+'
+
+          echo "PR Title: $PR_TITLE"
+          echo "PR Branch: $PR_BRANCH"
+
+          if [[ "$PR_TITLE" =~ $JIRA_PATTERN ]]; then
+            TICKET="${BASH_REMATCH[0]}"
+            echo "✅ Found Jira ticket '$TICKET' in PR title"
+            exit 0
+          fi
+
+          if [[ "$PR_BRANCH" =~ $JIRA_PATTERN ]]; then
+            TICKET="${BASH_REMATCH[0]}"
+            echo "⚠️  Jira ticket '$TICKET' found in branch name but NOT in PR title"
+            echo "Please include the Jira ticket ID in the PR title, e.g.: '$TICKET: <description>'"
+            exit 1
+          fi
 
+          echo "❌ No Jira ticket ID found in PR title or branch name"
+          echo ""
+          echo "PR title must contain a Jira ticket ID matching pattern: HOTE-<number>"
+          echo "Example: 'HOTE-123: Add user authentication'"
+          exit 1
   metadata:
     name: "Set CI/CD metadata"
     runs-on: ubuntu-latest
@@ -48,28 +66,30 @@ jobs:
         id: variables
         run: |
           datetime=$(date -u +'%Y-%m-%dT%H:%M:%S%z')
-          BUILD_DATETIME=$datetime make version-create-effective-file
-          echo "build_datetime_london=$(TZ=Europe/London date --date=$datetime +'%Y-%m-%dT%H:%M:%S%z')" >> $GITHUB_OUTPUT
-          echo "build_datetime=$datetime" >> $GITHUB_OUTPUT
-          echo "build_timestamp=$(date --date=$datetime -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
-          echo "build_epoch=$(date --date=$datetime -u +'%s')" >> $GITHUB_OUTPUT
-          echo "nodejs_version=$(grep "^v" .nvmrc | cut -f2 -d'v')" >> $GITHUB_OUTPUT
-          echo "python_version=$(grep "^python\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "terraform_version=$(grep "^terraform\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" >> $GITHUB_OUTPUT
+          BUILD_DATETIME="$datetime" make version-create-effective-file
+          {
+            echo "build_datetime_london=$(TZ=Europe/London date --date="$datetime" +'%Y-%m-%dT%H:%M:%S%z')"
+            echo "build_datetime=$datetime"
+            echo "build_timestamp=$(date --date="$datetime" -u +'%Y%m%d%H%M%S')"
+            echo "build_epoch=$(date --date="$datetime" -u +'%s')"
+            echo "nodejs_version=$(grep "^nodejs\s" .tool-versions | cut -f2 -d' ')"
+            echo "python_version=$(grep "^python\s" .tool-versions | cut -f2 -d' ')"
+            echo "terraform_version=$(grep "^terraform\s" .tool-versions | cut -f2 -d' ')"
+            echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)"
+          } >> "$GITHUB_OUTPUT"
       - name: "Check if pull request exists for this branch"
         id: pr_exists
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          branch_name=${GITHUB_HEAD_REF:-$(echo $GITHUB_REF | sed 's#refs/heads/##')}
+          branch_name=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           echo "Current branch is '$branch_name'"
-          if gh pr list --head $branch_name | grep -q .; then
+          if gh pr list --head "$branch_name" | grep -q .; then
             echo "Pull request exists"
-            echo "does_pull_request_exist=true" >> $GITHUB_OUTPUT
+            echo "does_pull_request_exist=true" >> "$GITHUB_OUTPUT"
           else
             echo "Pull request doesn't exist"
-            echo "does_pull_request_exist=false" >> $GITHUB_OUTPUT
+            echo "does_pull_request_exist=false" >> "$GITHUB_OUTPUT"
           fi
       - name: "List variables"
         run: |

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

@@ -28,14 +28,16 @@ jobs:
         id: variables
         run: |
           datetime=$(date -u +'%Y-%m-%dT%H:%M:%S%z')
-          echo "build_datetime=$datetime" >> $GITHUB_OUTPUT
-          echo "build_timestamp=$(date --date=$datetime -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
-          echo "build_epoch=$(date --date=$datetime -u +'%s')" >> $GITHUB_OUTPUT
-          echo "nodejs_version=$(grep "^nodejs\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "python_version=$(grep "^python\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "terraform_version=$(grep "^terraform\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          # TODO: Get the version, but it may not be the .version file as this should come from the CI/CD Pull Request Workflow
-          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" >> $GITHUB_OUTPUT
+          {
+            echo "build_datetime=$datetime"
+            echo "build_timestamp=$(date --date="$datetime" -u +'%Y%m%d%H%M%S')"
+            echo "build_epoch=$(date --date="$datetime" -u +'%s')"
+            echo "nodejs_version=$(grep "^nodejs\s" .tool-versions | cut -f2 -d' ')"
+            echo "python_version=$(grep "^python\s" .tool-versions | cut -f2 -d' ')"
+            echo "terraform_version=$(grep "^terraform\s" .tool-versions | cut -f2 -d' ')"
+            # TODO: Get the version, but it may not be the .version file as this should come from the CI/CD Pull Request Workflow
+            echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)"
+          } >> "$GITHUB_OUTPUT"
       - name: "List variables"
         run: |
           export BUILD_DATETIME="${{ steps.variables.outputs.build_datetime }}"
@@ -89,7 +91,7 @@ jobs:
     steps:
       - name: "Check prerequisites for notification"
         id: check
-        run: echo "secret_exist=${{ secrets.TEAMS_NOTIFICATION_WEBHOOK_URL != '' }}" >> $GITHUB_OUTPUT
+        run: echo "secret_exist=${{ secrets.TEAMS_NOTIFICATION_WEBHOOK_URL != '' }}" >> "$GITHUB_OUTPUT"
       - name: "Notify on publishing packages"
         if: steps.check.outputs.secret_exist == 'true'
         uses: nhs-england-tools/notify-msteams-action@v1.0.0

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

@@ -3,11 +3,6 @@ name: "CI/CD deploy"
 
 on:
   workflow_dispatch:
-    inputs:
-      tag:
-        description: "This is the tag that is oging to be deployed"
-        required: true
-        default: "latest"
 
 jobs:
   metadata:
@@ -22,23 +17,24 @@ jobs:
       python_version: ${{ steps.variables.outputs.python_version }}
       terraform_version: ${{ steps.variables.outputs.terraform_version }}
       version: ${{ steps.variables.outputs.version }}
-      tag: ${{ steps.variables.outputs.tag }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
+
       - name: "Set CI/CD variables"
         id: variables
         run: |
           datetime=$(date -u +'%Y-%m-%dT%H:%M:%S%z')
-          echo "build_datetime=$datetime" >> $GITHUB_OUTPUT
-          echo "build_timestamp=$(date --date=$datetime -u +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
-          echo "build_epoch=$(date --date=$datetime -u +'%s')" >> $GITHUB_OUTPUT
-          echo "nodejs_version=$(grep "^nodejs\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "python_version=$(grep "^python\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          echo "terraform_version=$(grep "^terraform\s" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
-          # TODO: Get the version, but it may not be the .version file as this should come from the CI/CD Pull Request Workflow
-          echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)" >> $GITHUB_OUTPUT
-          echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
+          {
+            echo "build_datetime=$datetime"
+            echo "build_timestamp=$(date --date="$datetime" -u +'%Y%m%d%H%M%S')"
+            echo "build_epoch=$(date --date="$datetime" -u +'%s')"
+            echo "nodejs_version=$(grep "^nodejs\s" .tool-versions | cut -f2 -d' ')"
+            echo "python_version=$(grep "^python\s" .tool-versions | cut -f2 -d' ')"
+            echo "terraform_version=$(grep "^terraform\s" .tool-versions | cut -f2 -d' ')"
+            # TODO: Get the version, but it may not be the .version file as this should come from the CI/CD Pull Request Workflow
+            echo "version=$(head -n 1 .version 2> /dev/null || echo unknown)"
+          } >> "$GITHUB_OUTPUT"
       - name: "List variables"
         run: |
           export BUILD_DATETIME="${{ steps.variables.outputs.build_datetime }}"
@@ -48,8 +44,8 @@ jobs:
           export PYTHON_VERSION="${{ steps.variables.outputs.python_version }}"
           export TERRAFORM_VERSION="${{ steps.variables.outputs.terraform_version }}"
           export VERSION="${{ steps.variables.outputs.version }}"
-          export TAG="${{ steps.variables.outputs.tag }}"
           make list-variables
+
   deploy:
     name: "Deploy to an environment"
     runs-on: ubuntu-latest

.github/workflows/playwright-e2e.yaml

@@ -1,11 +1,20 @@
 ---
 name: "Playwright E2E Tests"
+run-name: "E2E Tests: env: ${{ inputs.environment || 'local' }}, browser: ${{ inputs.browser || 'chromium' }}, filter: ${{ inputs.test_filter && format(' - {0}', inputs.test_filter) || '' }}"
 
 on:
   schedule:
     - cron: '0 2 * * *'  # Every day at 2am UTC
   workflow_dispatch:
     inputs:
+      environment:
+        description: "Target environment"
+        required: false
+        default: "local"
+        type: choice
+        options:
+          - local
+          - dev
       browser:
         description: "Browser to run tests on"
         required: false
@@ -27,15 +36,14 @@ jobs:
     name: "Playwright E2E tests"
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    env:
+      TARGET_ENV: ${{ inputs.environment || 'local' }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
 
-      - name: "Install mise"
-        uses: jdx/mise-action@v3
-        with:
-          install: true
-          cache: true
+      - name: Initialize mise
+        uses: ./.github/actions/init-mise
 
       - name: "Install Playwright browsers"
         working-directory: tests
@@ -57,34 +65,50 @@ jobs:
           EOF
 
       - name: "Start the application"
+        if: env.TARGET_ENV == 'local' || env.TARGET_ENV == 'dev'
         run: |
           npm run start
 
       - name: "Show application status"
+        if: env.TARGET_ENV == 'local' || env.TARGET_ENV == 'dev'
         run: |
           docker compose -f local-environment/docker-compose.yml ps
           docker logs ui
 
       - name: "Get terraform outputs"
+        if: env.TARGET_ENV == 'local' || env.TARGET_ENV == 'dev'
         id: terraform
         run: |
           UI_URL=$(terraform -chdir=local-environment/infra output -raw ui_url)
           API_URL=$(terraform -chdir=local-environment/infra output -raw api_base_url)
-          echo "ui_url=$UI_URL" >> $GITHUB_OUTPUT
-          echo "api_base_url=$API_URL" >> $GITHUB_OUTPUT
+          echo "ui_url=$UI_URL" >> "$GITHUB_OUTPUT"
+          echo "api_base_url=$API_URL" >> "$GITHUB_OUTPUT"
           echo "UI URL: $UI_URL"
           echo "API URL: $API_URL"
 
+      - name: "Set environment URLs"
+        id: urls
+        run: |
+          if [ "$TARGET_ENV" == "dev" ]; then
+            echo "ui_url=https://dev.hometest.service.nhs.uk" >> "$GITHUB_OUTPUT"
+            echo "api_url=https://dev.hometest.service.nhs.uk/" >> "$GITHUB_OUTPUT"
+          else
+            echo "ui_url=${{ steps.terraform.outputs.ui_url }}" >> "$GITHUB_OUTPUT"
+            echo "api_url=${{ steps.terraform.outputs.api_base_url }}" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: "Wait for UI to be reachable"
         run: |
-          UI_URL="${{ steps.terraform.outputs.ui_url }}"
+          UI_URL="${{ steps.urls.outputs.ui_url }}"
           echo "Waiting for UI to be reachable at $UI_URL..."
           timeout=120
           elapsed=0
           until curl -sf "$UI_URL" > /dev/null 2>&1; do
             if [ $elapsed -ge $timeout ]; then
               echo "Timeout: UI not reachable after ${timeout}s"
-              docker logs ui
+              if [ "$TARGET_ENV" == "local" ] || [ "$TARGET_ENV" == "dev" ]; then
+                docker logs ui
+              fi
               exit 1
             fi
             echo "Waiting... (${elapsed}s)"
@@ -101,7 +125,7 @@ jobs:
           FILTER="${{ inputs.test_filter }}"
 
           # Build the command
-          CMD="npx playwright test"
+          CMD="HEADLESS=true ENV=dev npx playwright test"
 
           # Add browser project
           if [ "$BROWSER" != "all" ]; then
@@ -114,19 +138,19 @@ jobs:
           fi
 
           echo "Running: $CMD"
-          eval $CMD
+          eval "$CMD"
         env:
           CI: true
           FORCE_COLOR: true
-          UI_BASE_URL: ${{ steps.terraform.outputs.ui_url }}
-          API_BASE_URL: ${{ steps.terraform.outputs.api_base_url }}
+          UI_BASE_URL: ${{ steps.urls.outputs.ui_url }}
+          API_BASE_URL: ${{ steps.urls.outputs.api_url }}
 
       - name: "Grab docker compose logs"
+        if: always() && (env.TARGET_ENV == 'local' || env.TARGET_ENV == 'dev')
         run: |
           for service in $(docker compose -f local-environment/docker-compose.yml ps --services); do
             docker compose -f local-environment/docker-compose.yml logs "$service" > "tests/testResults/docker-compose-${service}.log" 2>&1
           done
-        if: always()
 
       - name: "Publish Test Results"
         uses: dorny/test-reporter@v2
@@ -140,24 +164,26 @@ jobs:
       - name: "Generate Job Summary"
         if: always()
         run: |
-          echo "## Playwright Test Results" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          if [ -f tests/testResults/junit-results.xml ]; then
-            TESTS=$(grep -oP 'tests="\K[0-9]+' tests/testResults/junit-results.xml | head -1)
-            FAILURES=$(grep -oP 'failures="\K[0-9]+' tests/testResults/junit-results.xml | head -1)
-            ERRORS=$(grep -oP 'errors="\K[0-9]+' tests/testResults/junit-results.xml | head -1)
-            TIME=$(grep -oP 'time="\K[0-9.]+' tests/testResults/junit-results.xml | head -1)
-            PASSED=$((TESTS - FAILURES - ERRORS))
-            echo "| Metric | Value |" >> $GITHUB_STEP_SUMMARY
-            echo "|--------|-------|" >> $GITHUB_STEP_SUMMARY
-            echo "| Total Tests | $TESTS |" >> $GITHUB_STEP_SUMMARY
-            echo "| :white_check_mark: Passed | $PASSED |" >> $GITHUB_STEP_SUMMARY
-            echo "| :x: Failed | $FAILURES |" >> $GITHUB_STEP_SUMMARY
-            echo "| :warning: Errors | $ERRORS |" >> $GITHUB_STEP_SUMMARY
-            echo "| :stopwatch: Duration | ${TIME}s |" >> $GITHUB_STEP_SUMMARY
-          else
-            echo ":warning: No test results found" >> $GITHUB_STEP_SUMMARY
-          fi
+          {
+            echo "## Playwright Test Results"
+            echo ""
+            if [ -f tests/testResults/junit-results.xml ]; then
+              TESTS=$(grep -oP 'tests="\K[0-9]+' tests/testResults/junit-results.xml | head -1)
+              FAILURES=$(grep -oP 'failures="\K[0-9]+' tests/testResults/junit-results.xml | head -1)
+              ERRORS=$(grep -oP 'errors="\K[0-9]+' tests/testResults/junit-results.xml | head -1)
+              TIME=$(grep -oP 'time="\K[0-9.]+' tests/testResults/junit-results.xml | head -1)
+              PASSED=$((TESTS - FAILURES - ERRORS))
+              echo "| Metric | Value |"
+              echo "|--------|-------|"
+              echo "| Total Tests | $TESTS |"
+              echo "| :white_check_mark: Passed | $PASSED |"
+              echo "| :x: Failed | $FAILURES |"
+              echo "| :warning: Errors | $ERRORS |"
+              echo "| :stopwatch: Duration | ${TIME}s |"
+            else
+              echo ":warning: No test results found"
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"
 
       - name: "Upload test results"
         uses: actions/upload-artifact@v7

.pre-commit-config.yaml

@@ -8,13 +8,20 @@ repos:
         args: [--markdown-linebreak-ext=md]
       - id: end-of-file-fixer
       - id: check-yaml
+        args: [--allow-multiple-documents]
       - id: check-json
+      - id: check-toml
       - id: check-added-large-files
+        args: ["--maxkb=500"]
       - id: check-case-conflict
       - id: check-merge-conflict
+      - id: check-symlinks
       - id: detect-private-key
       - id: check-executables-have-shebangs
-      - id: forbid-submodules
+      - id: mixed-line-ending
+        args: [--fix=lf]
+      - id: no-commit-to-branch
+        args: [--branch, main, --branch, master, --branch, develop]
 
   - repo: local
     hooks:

local-environment/scripts/localstack/deploy.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 set -ex
-SCRIPT_DIR=$(dirname "$0")
 
 ENDPOINT_URL="http://localstack:4566"
-ROLE_ARN="arn:aws:iam::000000000000:role/lambda-exec"
 
 export AWS_ACCESS_KEY_ID="test"
 export AWS_SECRET_ACCESS_KEY="test"

local-environment/scripts/localstack/get_supplier_id.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-for i in {1..10}; do
+for _ in {1..10}; do
   SUPPLIER_ID=$(docker exec postgres-db psql "postgresql://app_user:STRONG_APP_PASSWORD@localhost:5432/local_hometest_db" -A -t -c "SET search_path TO hometest; SELECT supplier_id FROM supplier LIMIT 1;" 2>/dev/null | grep -v '^$' | grep -v '^SET$' | head -n 1 || echo "")
   if [[ -n "$SUPPLIER_ID" ]]; then
     echo "{\"supplier_id\": \"$SUPPLIER_ID\"}"