Release/v2.1 feature picks

.env.template

@@ -44,6 +44,7 @@ AUTH_SECRET=some-random-secret-works
 # Playwright tests
 TEST_APP_URL=https://localhost:3000/check-and-book-vaccinations
 TEST_NHS_APP_URL=https://<fake-sso-app>/auth/login?vita=https://localhost:3000
+USE_FAKE_AUTH=false
 TEST_NHS_APP_USERNAME=
 TEST_NHS_APP_PASSWORD=
 TEST_NBS_APP_USERNAME=

.github/actions/run-contract-tests/action.yml

@@ -19,6 +19,17 @@ runs:
         ref: ${{ inputs.target_ref }}
         path: "code-for-contract-tests"
 
+    - name: "Read nodejs version from .tool-versions"
+      shell: bash
+      id: variables
+      run: |
+        echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
+    - name: "Setup nodejs ${{ steps.variables.outputs.nodejs_version }}"
+      uses: actions/setup-node@v6
+      with:
+        node-version: ${{ steps.variables.outputs.nodejs_version }}
+
     - name: "Cache node modules"
       uses: actions/cache@v4
       env:

.github/actions/run-e2e-tests/action.yaml

@@ -19,6 +19,17 @@ runs:
         ref: ${{ inputs.checkout_ref }}
         path: "code-for-e2e-tests"
 
+    - name: "Read nodejs version from .tool-versions"
+      shell: bash
+      id: variables
+      run: |
+        echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
+    - name: "Setup nodejs ${{ steps.variables.outputs.nodejs_version }}"
+      uses: actions/setup-node@v6
+      with:
+        node-version: ${{ steps.variables.outputs.nodejs_version }}
+
     - name: Cache node modules
       id: cache-npm
       uses: actions/cache@v4

.github/actions/run-nbs-e2e-tests/action.yaml

@@ -16,6 +16,17 @@ runs:
         ref: ${{ inputs.checkout_ref }}
         path: "code-for-e2e-tests"
 
+    - name: "Read nodejs version from .tool-versions"
+      shell: bash
+      id: variables
+      run: |
+        echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
+    - name: "Setup nodejs ${{ steps.variables.outputs.nodejs_version }}"
+      uses: actions/setup-node@v6
+      with:
+        node-version: ${{ steps.variables.outputs.nodejs_version }}
+
     - name: Cache node modules
       id: cache-npm
       uses: actions/cache@v4

.github/actions/run-snapshot-tests/action.yaml

@@ -19,6 +19,17 @@ runs:
         ref: ${{ inputs.checkout_ref }}
         path: "code-for-snapshot-tests"
 
+    - name: "Read nodejs version from .tool-versions"
+      shell: bash
+      id: variables
+      run: |
+        echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
+    - name: "Setup nodejs ${{ steps.variables.outputs.nodejs_version }}"
+      uses: actions/setup-node@v6
+      with:
+        node-version: ${{ steps.variables.outputs.nodejs_version }}
+
     - name: "Configure AWS credentials"
       uses: aws-actions/configure-aws-credentials@v5
       with:

.github/dependabot.yaml

@@ -32,10 +32,6 @@ updates:
       prettier:
         patterns: [ "prettier", "prettier*", "*prettier", "*prettier*" ]
     ignore:
-      - dependency-name: "next"
-        versions: [ ">=16.0.0" ]
-      - dependency-name: "eslint-config-next"
-        versions: [ ">=16.0.0" ]
       - dependency-name: "eslint"
         versions: [ ">=10.0.0" ]
     cooldown:

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

@@ -173,4 +173,5 @@ jobs:
     with:
       environment: "dev"
       checkout_ref: "${{ github.sha }}"
+      nodejs_version: "${{ needs.metadata.outputs.nodejs_version }}"
     secrets: inherit

.github/workflows/cicd-10-scheduled-nbs-assurance.yaml

@@ -6,6 +6,20 @@ on:
   workflow_dispatch: {}
 
 jobs:
+  metadata:
+    name: "Set CI/CD metadata"
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    outputs:
+      nodejs_version: ${{ steps.variables.outputs.nodejs_version }}
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v6
+      - name: "Set CI/CD variables"
+        id: variables
+        run: |
+          echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
   run-elid-api-tests:
     # Only call the tests for preprod environment
     # - ensures EliD's database is loaded with expected test scenarios
@@ -35,7 +49,7 @@ jobs:
     environment:
       name: "preprod"
 
-    needs: [ run-elid-api-tests ]
+    needs: [ metadata, run-elid-api-tests ]
     if: ${{ !cancelled() }}
     steps:
       - name: "Checkout main branch"
@@ -53,6 +67,11 @@ jobs:
       - name: "Checkout code"
         uses: actions/checkout@v6
 
+      - name: "Setup nodejs ${{ needs.metadata.outputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ needs.metadata.outputs.nodejs_version }}
+
       - name: "Deploy version ${{ steps.get-latest-tag-name.outputs.value }} to (preprod)"
         timeout-minutes: 10
         uses: ./.github/actions/deploy

.github/workflows/cicd-11-run-snapshot-tests.yaml

@@ -7,9 +7,29 @@ env:
   AWS_REGION: eu-west-2
 
 jobs:
+
+  #################################################
+  # Set up metadata for the jobs
+  #################################################
+
+  metadata:
+    name: "Set CI/CD metadata"
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    outputs:
+      nodejs_version: ${{ steps.variables.outputs.nodejs_version }}
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v6
+      - name: "Set CI/CD variables"
+        id: variables
+        run: |
+          echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
   run-snapshot-tests:
     name: "Snapshot tests"
     runs-on: "ubuntu-latest"
+    needs: [ metadata ]
     timeout-minutes: 30
     concurrency:
       group: "preprod-env"
@@ -27,6 +47,11 @@ jobs:
           fetch-depth: 0
           ref: "main"
 
+      - name: "Setup nodejs ${{ needs.metadata.outputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ needs.metadata.outputs.nodejs_version }}
+
       - name: "Configure AWS credentials"
         uses: aws-actions/configure-aws-credentials@v5
         with:

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

@@ -17,6 +17,20 @@ jobs:
   # Deploy action - download artefacts and deploy to AWS
   #############################################################
 
+  metadata:
+    name: "Set CI/CD metadata"
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    outputs:
+      nodejs_version: ${{ steps.variables.outputs.nodejs_version }}
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v6
+      - name: "Set CI/CD variables"
+        id: variables
+        run: |
+          echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
   deploy-action:
     name: "Deploy ${{ github.ref_name }} to (${{ github.event.inputs.environment }})"
     runs-on: ubuntu-latest
@@ -57,9 +71,10 @@ jobs:
   acceptance-stage:
     name: "Acceptance stage (dev/preprod only)"
     if: ${{ contains(fromJSON('["dev","preprod"]'), github.event.inputs.environment) }}
-    needs: [ deploy-action ]
+    needs: [ metadata, deploy-action ]
     uses: ./.github/workflows/stage-5-acceptance.yaml
     with:
       environment: ${{ github.event.inputs.environment}}
       checkout_ref: ${{ github.ref_name }}
+      nodejs_version: ${{ needs.metadata.outputs.nodejs_version }}
     secrets: inherit

.github/workflows/cicd-9-scheduled-assurance.yaml

@@ -17,6 +17,21 @@ env:
   R2_RELEASE_BRANCH: "release/v2.0"
 
 jobs:
+
+  metadata:
+    name: "Set CI/CD metadata"
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    outputs:
+      nodejs_version: ${{ steps.variables.outputs.nodejs_version }}
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v6
+      - name: "Set CI/CD variables"
+        id: variables
+        run: |
+          echo "nodejs_version=$(grep "^nodejs" .tool-versions | cut -f2 -d' ')" >> $GITHUB_OUTPUT
+
   ##########################################################
   # EliD API tests - to load their DB with test scenarios
   ##########################################################
@@ -44,14 +59,19 @@ jobs:
     environment:
       name: "preprod"
 
-    needs: [ run-elid-api-tests ]
+    needs: [ metadata, run-elid-api-tests ]
     if: ${{ !cancelled() && (github.event_name=='schedule' || (github.event_name=='workflow_dispatch' && (inputs.release=='All' || inputs.release=='Latest R2 tag'))) }}
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
+      - name: "Setup nodejs ${{ needs.metadata.outputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ needs.metadata.outputs.nodejs_version }}
+
       - name: "Get latest tag name on ${{ env.R2_RELEASE_BRANCH }} branch"
         id: get-latest-tag-name
         run: |
@@ -152,7 +172,7 @@ jobs:
     environment:
       name: "preprod"
 
-    needs: [ deploy-and-test-r2 ]
+    needs: [ metadata, deploy-and-test-r2 ]
     if: ${{ !cancelled() && (github.event_name=='schedule' || (github.event_name=='workflow_dispatch' && (inputs.release=='All' || inputs.release=='Latest main tag'))) }}
     steps:
       - name: "Checkout main branch"
@@ -161,6 +181,11 @@ jobs:
           fetch-depth: 0
           ref: "main"
 
+      - name: "Setup nodejs ${{ needs.metadata.outputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ needs.metadata.outputs.nodejs_version }}
+
       - name: "Get latest tag name on main branch"
         id: get-latest-tag-name
         run: |

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

@@ -131,6 +131,10 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
+      - name: "Setup nodejs ${{ inputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ inputs.nodejs_version }}
       - name: Cache node modules
         id: cache-npm
         uses: actions/cache@v5

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

@@ -40,6 +40,10 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
+      - name: "Setup nodejs ${{ inputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ inputs.nodejs_version }}
       - name: Cache node modules
         id: cache-npm
         uses: actions/cache@v5
@@ -61,6 +65,10 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
+      - name: "Setup nodejs ${{ inputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ inputs.nodejs_version }}
       - name: Cache node modules
         id: cache-npm
         uses: actions/cache@v5

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

@@ -49,6 +49,10 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6
+      - name: "Setup nodejs ${{ inputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ inputs.nodejs_version }}
       - name: Cache node modules
         id: cache-npm
         uses: actions/cache@v5

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

@@ -16,6 +16,10 @@ on:
         required: false
         type: boolean
         default: false
+      nodejs_version:
+        description: "Node.js version, set by the CI/CD pipeline workflow"
+        required: true
+        type: string
 
 env:
   AWS_REGION: eu-west-2
@@ -59,6 +63,11 @@ jobs:
         with:
           ref: ${{ inputs.checkout_ref }}
 
+      - name: "Setup nodejs ${{ inputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+
       - name: "Configure AWS credentials"
         uses: aws-actions/configure-aws-credentials@v5
         with:
@@ -105,6 +114,11 @@ jobs:
         with:
           ref: ${{ inputs.checkout_ref }}
 
+      - name: "Setup nodejs ${{ inputs.nodejs_version }}"
+        uses: actions/setup-node@v6
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+
       - name: "Run contract tests for version ${{ inputs.checkout_ref }} (EliD:sandpit, EliD:mocked)"
         timeout-minutes: 3
         uses: ./.github/actions/run-contract-tests

.tool-versions

@@ -1,14 +1,11 @@
 # This file is for you! Please, updated to the versions agreed by your team.
-
 terraform 1.14.1
 pre-commit 4.5.0
 vale 3.13.0
-nodejs 22.13.1
+nodejs 24.14.0
 gitleaks 8.30.1
-
 # ==============================================================================
 # The section below is reserved for Docker image versions.
-
 # TODO: Move this section - consider using a different file for the repository template dependencies.
 # docker/ghcr.io/anchore/grype v0.106.0@sha256:f6fa9ac31f97591957edb13b7c7c24fd172cf11b6e2a2df5dd3464ebb8eefefc # SEE: https://github.com/anchore/grype/pkgs/container/grype
 # docker/ghcr.io/anchore/syft v1.41.0@sha256:046f0c3b14e4451a1d0cd2f367ce3ba3bd653cbd23a7749556f46592d0281a0d # SEE: https://github.com/anchore/syft/pkgs/container/syft