Merge remote-tracking branch 'origin/PRMP-1057-2' into PRMP-1058

Author: PedroSoaresNHS

.github/workflows/automated-pr-validator.yml

@@ -56,7 +56,7 @@ jobs:
           output-format: sarif
 
       - name: Upload Anchore scan SARIF report
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         if: always()
         with:
           sarif_file: ${{ steps.sbom-scan.outputs.sarif }}

.github/workflows/base-cypress-build.yml

@@ -44,7 +44,7 @@ jobs:
         working-directory: ./app
 
       - name: Cypress build
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v7
         with:
           # Disable running of tests within install job
           install: false
@@ -53,7 +53,7 @@ jobs:
           working-directory: ./app
 
       - name: Save build folder
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: build
           if-no-files-found: error

.github/workflows/base-cypress-smoketest.yml

@@ -55,7 +55,7 @@ jobs:
         working-directory: ./app
 
       - name: Cypress run
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v7
         with:
           install: false
           browser: chrome
@@ -71,13 +71,13 @@ jobs:
           CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
           CYPRESS_OUTPUT_VIDEO: true
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: cypress-screenshots
           path: /home/runner/work/national-document-repository/national-document-repository/app/cypress/screenshots
           if-no-files-found: ignore
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: cypress-videos
@@ -109,7 +109,7 @@ jobs:
         working-directory: ./app
 
       - name: Cypress run
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v7
         with:
           install: false
           browser: edge

.github/workflows/base-cypress-test.yml

@@ -44,7 +44,7 @@ jobs:
           ref: ${{ inputs.build_branch }}
 
       - name: Download the build folder
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: build
           path: ./app/build
@@ -62,7 +62,7 @@ jobs:
         run: cp ./app/build/main.html ./app/build/index.html
 
       - name: Cypress run
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v7
         with:
           install: false
           start: serve -s build
@@ -72,13 +72,13 @@ jobs:
           CYPRESS_BASE_URL: ${{ inputs.cypress_base_url }}
           CYPRESS_grepTags: "regression"
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: cypress-screenshots-${{ inputs.cypress_browser}}
           path: /home/runner/work/national-document-repository/national-document-repository/app/cypress/screenshots
           if-no-files-found: ignore
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: failure()
         with:
           name: cypress-videos-${{ inputs.cypress_browser}}

.github/workflows/base-e2e-backendtest.yml

@@ -1,4 +1,4 @@
-name: "Z-BASE E2e Test: E2e shared actions for running tests on the NDR Backend"
+name: "Z-BASE E2E Test: E2E shared actions for running Lloyd George FHIR API E2E tests on the NDR Backend"
 
 run-name: "${{ github.event.inputs.build_branch }} | ${{ github.event.inputs.environment }} | ${{ github.event.inputs.sandbox }}"
 
@@ -27,7 +27,7 @@ permissions:
   contents: read
 
 jobs:
-  e2e-test:
+  lg-fhir-e2e-test:
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
     steps:
@@ -82,6 +82,6 @@ jobs:
         env:
           SANDBOX: ${{ inputs.sandbox }}
 
-      - name: Run E2e Tests
+      - name: Run Lloyd George FHIR API E2E tests
         run: |
           make test-api-e2e

.github/workflows/base-e2e-fhir-backendtest.yml

@@ -1,4 +1,4 @@
-name: "Z-BASE FHIR API E2E Test: E2e shared actions for running FHIR API tests on the NDR Backend"
+name: "Z-BASE E2E Test: E2E shared actions for running Core FHIR API E2E tests on the NDR Backend"
 
 run-name: "${{ github.event.inputs.build_branch }} | ${{ github.event.inputs.environment }} | ${{ github.event.inputs.sandbox }}"
 
@@ -27,7 +27,7 @@ permissions:
   contents: read
 
 jobs:
-  e2e-test:
+  core-fhir-e2e-test:
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
     outputs:
@@ -62,5 +62,5 @@ jobs:
           source ./lambdas/venv/bin/activate
           echo PATH=$PATH >> $GITHUB_ENV
 
-      - name: Run E2e Tests
+      - name: Run Core FHIR API E2E tests
         run: make test-fhir-api-e2e WORKSPACE=${{ inputs.sandbox }}

.github/workflows/base-run-bulk-upload.yml

@@ -35,6 +35,21 @@ on:
         required: false
         type: "string"
         default: "3"
+      lambda_type:
+        description: "Which lambda to trigger (BulkUploadMetadataLambda or BulkUploadMetadataProcessor)"
+        required: false
+        type: "string"
+        default: "BulkUploadMetadataLambda"
+      run_bulk_upload_setup:
+        description: "Run bulk upload setup step"
+        required: false
+        type: "boolean"
+        default: true
+      run_document_review_setup:
+        description: "Run document review setup step"
+        required: false
+        type: "boolean"
+        default: true
     secrets:
       AWS_ASSUME_ROLE:
         required: true
@@ -67,6 +82,7 @@ jobs:
         working-directory: ./tests/bulk-upload/scripts
 
       - name: Setup Bulk Upload
+        if: ${{ inputs.run_bulk_upload_setup }}
         run: |
           python setup_bulk_upload.py \
             --environment "${{ inputs.sandbox }}" \
@@ -80,6 +96,7 @@ jobs:
         working-directory: ./tests/bulk-upload/scripts
 
       - name: Setup Document Review
+        if: ${{ inputs.run_document_review_setup }}
         run: |
           python setup_document_review.py
         working-directory: ./tests/bulk-upload/scripts
@@ -90,5 +107,6 @@ jobs:
         run: |
           python run_bulk_upload.py \
             --environment "${{ inputs.sandbox }}" \
+            --lambda-type "${{ inputs.lambda_type }}" \
             --start-bulk-upload
         working-directory: ./tests/bulk-upload/scripts

.github/workflows/full-deploy-to-pre-prod.yml

@@ -136,8 +136,8 @@ jobs:
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
 
-  run_backend_e2e_tests:
-    name: Run E2E Tests
+  run_fhir_api_e2e_tests:
+    name: Run FHIR API E2E Tests
     needs: ["deploy_all_lambdas"]
     uses: ./.github/workflows/ndr-e2e-test-sandbox.yml
     with:
@@ -146,4 +146,3 @@ jobs:
       sandbox: pre-prod
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
-  

.github/workflows/full-deploy-to-sandbox.yml

@@ -25,6 +25,14 @@ on:
         required: true
         type: boolean
         default: false
+      lambda_type:
+        description: "Which lambda to trigger for bulk upload (only applies if bulk_upload is true)"
+        required: false
+        type: choice
+        options:
+          - "Bulk upload metadata"
+          - "NEW bulk metadata processor"
+        default: "Bulk upload metadata"
       disable_pds:
         description: "Do you want to disable the PDS stub?"
         required: true
@@ -169,5 +177,6 @@ jobs:
       combi_settings: "combi300"
       base_branch: ${{ inputs.build_branch }}
       file_count: "3"
+      lambda_type: ${{ inputs.lambda_type == 'NEW bulk metadata processor' && 'BulkUploadMetadataProcessor' || 'BulkUploadMetadataLambda' }}
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}

.github/workflows/run-bulk-upload-dev.yml

@@ -1,6 +1,6 @@
 name: Run Bulk Upload - Dev
 
-run-name: "${{ github.event.inputs.sandbox }} | ${{ github.event.inputs.combi_settings }} | ${{ github.event.inputs.file_count }}"
+run-name: "${{ github.event.inputs.sandbox }} | ${{ github.event.inputs.combi_settings }} | ${{ github.event.inputs.file_count }} | ${{ github.event.inputs.lambda_type }}"
 
 permissions:
   pull-requests: write
@@ -27,6 +27,14 @@ on:
         required: true
         type: "string"
         default: "3"
+      lambda_type:
+        description: "Which lambda to trigger"
+        required: true
+        type: choice
+        options:
+          - "BulkUploadMetadataLambda"
+          - "BulkUploadMetadataProcessor"
+        default: "BulkUploadMetadataLambda"
 
 jobs:
   bulk_upload:
@@ -36,5 +44,6 @@ jobs:
       sandbox: "${{ inputs.sandbox }}"
       combi_settings: "${{ inputs.combi_settings }}"
       file_count: "${{ inputs.file_count }}"
+      lambda_type: "${{ inputs.lambda_type }}"
     secrets:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}