NHSDigital
diff --git a/‎.devcontainer/Dockerfile‎
Lines changed: 3 additions & 2 deletions b/‎.devcontainer/Dockerfile‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎.devcontainer/devcontainer.json‎
Lines changed: 4 additions & 2 deletions b/‎.devcontainer/devcontainer.json‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎.gitallowed‎
Lines changed: 15 additions & 0 deletions b/‎.gitallowed‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/ci.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/pr-link.yml‎
Lines changed: 24 additions & 9 deletions b/‎.github/workflows/pr-link.yml‎
Lines changed: 24 additions & 9 deletions
diff --git a/‎.github/workflows/pull_request.yml‎
Lines changed: 1 addition & 2 deletions b/‎.github/workflows/pull_request.yml‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎.github/workflows/quality_checks.yml‎
Lines changed: 0 additions & 51 deletions b/‎.github/workflows/quality_checks.yml‎
Lines changed: 0 additions & 51 deletions
diff --git a/‎.github/workflows/regression_tests.yml‎
Lines changed: 4 additions & 5 deletions b/‎.github/workflows/regression_tests.yml‎
Lines changed: 4 additions & 5 deletions
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/release.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.pre-commit-config.yaml‎
Lines changed: 11 additions & 1 deletion b/‎.pre-commit-config.yaml‎
Lines changed: 11 additions & 1 deletion
@@ -25,8 +25,9 @@ ENV PATH="$PATH:/home/vscode/.asdf/bin/"
 RUN asdf plugin add python; \
     asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git; \
     asdf plugin add shellcheck https://github.com/luizm/asdf-shellcheck.git; \
-    asdf plugin add nodejs;\
-    asdf plugin add actionlint;
+    asdf plugin add nodejs; \
+    asdf plugin add actionlint; \
+    asdf plugin add allure
 
 WORKDIR /workspaces/electronic-prescription-service-api-regression-tests
 ADD .tool-versions /workspaces/electronic-prescription-service-api-regression-tests/.tool-versions
 
@@ -18,7 +18,8 @@
         "version": "latest",
         "moby": "true",
         "installDockerBuildx": "true"
-      }
+      },
+      "ghcr.io/devcontainers/features/github-cli:1": {}
     },
     "customizations": {
       "vscode": {
@@ -58,7 +59,8 @@
         }
       }
     },
-    "postCreateCommand": "rm -f ~/.docker/config.json; git config --global --add safe.directory /workspaces/electronic-prescription-service-api-regression-tests; make install"
+    "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" },
+    "postCreateCommand": "rm -f ~/.docker/config.json; git config --global --add safe.directory /workspaces/electronic-prescription-service-api-regression-tests; make install; docker build -f https://raw.githubusercontent.com/NHSDigital/eps-workflow-quality-checks/refs/heads/main/dockerfiles/nhsd-git-secrets.dockerfile -t git-secrets ."
     // "features": {},
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
     // "forwardPorts": [],
 
@@ -0,0 +1,15 @@
+char\[\] password = System\.getenv\("MVNW_PASSWORD"\)\.toCharArray\(\);
+wget --http-user=\$MVNW_USERNAME --http-.*
+<version>1\.8\.0\.1<\/version>
+github-token: ?"?\$\{\{\s*secrets\.GITHUB_TOKEN\s*\}\}"?
+"code": "1\.2\.840\.10065\.1\.12\.1\.1"
+java corretto-21\.0\.2\.14\.1
+CidrIp: "0\.0\.0\.0\/0"
+CidrBlock:\s?"?10\.0\.\d+\.\d+\/\d+"
+.*cloudfront\/IOPSValidation\.yaml.*
+.*tcp:\/\/0\.0\.0\.0:8888.*
+.*\.gitallowed.*
+.*steps\.generate-token\.outputs\.token.*
+.*token_response\[\"access_token\"\].*
+.*password=None.*
+.*secrets.REGRESSION_TESTS_PAT.*
@@ -9,7 +9,7 @@ env:
 
 jobs:
   quality_checks:
-    uses: ./.github/workflows/quality_checks.yml
+    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.2
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
 
@@ -1,5 +1,5 @@
 name: PR Link ticket
-on:
+on: 
   pull_request:
     types: [opened]
 jobs:
@@ -9,23 +9,38 @@ jobs:
       REF: ${{ github.event.pull_request.head.ref }}
     steps:
       - name: Check ticket name conforms to requirements
-        run: echo "$REF" | grep -i -E -q "(aea-[0-9]+)|(dependabot\/)"
+        run: echo "$REF" | grep -i -E -q "(aea-[0-9]+)|(apm-[0-9]+)|(apmspii-[0-9]+)|(adz-[0-9]+)|(amb-[0-9]+)|(dependabot\/)"
         continue-on-error: true
 
       - name: Grab ticket name
-        if: contains(github.event.pull_request.head.ref, 'aea-') || contains(github.event.pull_request.head.ref, 'AEA-')
-        run: echo name=TICKET_NAME::"$(echo "$REF" | grep -i -o '\(aea-[0-9]\+\)' | tr '[:lower:]' '[:upper:]')" >> "$GITHUB_ENV"
+        if: contains(github.event.pull_request.head.ref, 'aea-') || contains(github.event.pull_request.head.ref, 'AEA-') || contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'apmspii-') || contains(github.event.pull_request.head.ref, 'APMSPII-') || 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-')
         continue-on-error: true
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+        run: |
+          # Match ticket name patterns
+          REGEX='
+            (aea-[0-9]+)|
+            (apm-[0-9]+)|
+            (apmspii-[0-9]+)|
+            (adz-[0-9]+)|
+            (amb-[0-9]+)
+          '
+
+          # Remove whitespace and newlines from the regex
+          REGEX=$(echo "$REGEX" | tr -d '[:space:]')
+
+          # Extract the ticket name and convert to uppercase
+          TICKET_NAME=$(echo "$REF" | grep -i -E -o "$REGEX" | tr '[:lower:]' '[:upper:]')
+
+          # Set the environment variable
+          echo "TICKET_NAME=$TICKET_NAME" >> "$GITHUB_ENV"
 
       - name: Comment on PR with link to JIRA ticket
-        if: contains(github.event.pull_request.head.ref, 'aea-') || contains(github.event.pull_request.head.ref, 'AEA-')
+        if: contains(github.event.pull_request.head.ref, 'aea-') || contains(github.event.pull_request.head.ref, 'AEA-') || contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'apmspii-') || contains(github.event.pull_request.head.ref, 'APMSPII-') || 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-')
         continue-on-error: true
-        uses: unsplash/comment-on-pr@master
+        uses: unsplash/comment-on-pr@b5610c6125a7197eaec80072ea35ef53e1fc6035
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           msg: |
-            This branch is work on a ticket in the NHS England AEA JIRA Project. Here's a handy link to the ticket:
+            This branch is work on a ticket in an NHS Digital JIRA Project. Here's a handy link to the ticket:
             # [${{ env.TICKET_NAME }}](https://nhsd-jira.digital.nhs.uk/browse/${{ env.TICKET_NAME }})
@@ -9,10 +9,9 @@ env:
 
 jobs:
   quality_checks:
-    uses: ./.github/workflows/quality_checks.yml
+    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.2
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-    
 
   pr_title_format_check:
     uses: ./.github/workflows/pr_title_check.yml
@@ -17,6 +17,8 @@ on:
         type: choice
         options:
           - EPS-FHIR
+          - EPS-FHIR-PRESCRIBING
+          - EPS-FHIR-DISPENSING
           - PFP-APIGEE
           - PFP-AWS
           - PSU
@@ -128,13 +130,10 @@ jobs:
           owner: "NHSDigital"
           repositories: "electronic-prescription-service-api-regression-tests,eps-test-reports"
 
-      - name: Send Results
-        run: |
-          poetry run python scripts/send_test_results.py --token=${{ steps.generate-token.outputs.token }} --run_id ${{GITHUB.RUN_ID}}
-
       - name: Report failure on test failure
         if: steps.tests.outcome != 'success'
         run: |
+          poetry run python scripts/send_test_results.py --token=${{ steps.generate-token.outputs.token }} --run_id ${{GITHUB.RUN_ID}}
           echo The regression tests step failed, this likely means there are test failures.
-          echo The report will be generated shortly
+          echo A test report will be generated shortly and can be viewed at: https://nhsdigital.github.io/eps-test-reports
           exit 1
@@ -8,7 +8,7 @@ env:
 
 jobs:
   quality_checks:
-    uses: ./.github/workflows/quality_checks.yml
+    uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.2
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
 
@@ -47,7 +47,17 @@ repos:
       entry: flake8
       language: system
       types: [python]
-
+        
+  - repo: local
+    hooks:
+      - id: git-secrets
+        name: Git Secrets
+        description: git-secrets scans commits, commit messages, and --no-ff merges to prevent adding secrets into your git repositories.
+        entry: bash
+        args:
+          - -c
+          - 'docker run -v "$LOCAL_WORKSPACE_FOLDER:/src" git-secrets --pre_commit_hook'
+        language: system
 
 fail_fast: false
 default_stages: [pre-commit, commit]