Merge branch 'master' of https://github.com/NHSDigital/electronic-pre…

…scription-service-api into AEA-4399-proxygen-setup-and-deployment-for-fhir-facade
NHSDigital · Nov 7, 2024 · 9dd9793 · 9dd9793
2 parents 71f26a4 + 80a47f9
commit 9dd9793
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -2,7 +2,7 @@
 FROM mcr.microsoft.com/devcontainers/base:ubuntu
 
 # this should be regularly updated to the latest version from https://github.com/NHSDigital/validation-service-fhir-r4/releases
-ARG VALIDATOR_VERSION_TAG=v1.0.200-alpha
+ARG VALIDATOR_VERSION_TAG=v1.0.205-alpha
 
 RUN apt-get update \
     && export DEBIAN_FRONTEND=noninteractive \

diff --git a/.github/workflows/run_package_code_and_api.yml b/.github/workflows/run_package_code_and_api.yml
@@ -124,7 +124,7 @@ jobs:
       - name: get latest validator release
         id: get_latest_validator_release
         run: |
-          LATEST_VALIDATOR_VERSION=v1.0.200-alpha
+          LATEST_VALIDATOR_VERSION=v1.0.205-alpha
           echo "LATEST_VALIDATOR_VERSION=${LATEST_VALIDATOR_VERSION}" >> "$GITHUB_ENV"
 
       - name: Download Dockerfile, manifest.json and JAR file for Validator

diff --git a/azure/azure-build-pipeline.yml b/azure/azure-build-pipeline.yml
@@ -30,7 +30,7 @@ extends:
     short_service_name: ${{ variables.short_service_name }}
     cache_steps:
       - bash: |
-          VALIDATOR_VERSION=v1.0.200-alpha
+          VALIDATOR_VERSION=v1.0.205-alpha
           echo "Using validator version ${VALIDATOR_VERSION}"
           echo "##vso[task.setvariable variable=VALIDATOR_VERSION]$VALIDATOR_VERSION"          
         displayName: get validator version

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bdd-tests/features/createPrescription.feature b/packages/bdd-tests/features/createPrescription.feature
@@ -62,7 +62,7 @@ Feature: Creating a prescription
       | 322341003 | High-strength Co-codamol 30mg | 20       | 2 times a day for 10 days | addEndorsement | ACBSET              | Advisory Committee on Borderline Substances |
     Then I get an error response 400
       | message                                                                                                                                                                                                                                                                                            |
-      | None of the codings provided are in the value set https://fhir.nhs.uk/ValueSet/DM-prescription-endorsement (https://fhir.nhs.uk/ValueSet/DM-prescription-endorsement), and a coding from this value set is required) (codes = https://fhir.nhs.uk/CodeSystem/medicationrequest-endorsement#ACBSET) |
+      | None of the codings provided are in the value set 'NHSBSAPrescriptionEndorsement' (https://fhir.nhs.uk/ValueSet/DM-prescription-endorsement\|4.0.2), and a coding from this value set is required) (codes = https://fhir.nhs.uk/CodeSystem/medicationrequest-endorsement#ACBSET) |
 
   Scenario Outline: Create 1 line item prescription - when missing required info
     When I prepare 1 prescription(s) for FGC1 with details
@@ -76,7 +76,7 @@ Feature: Creating a prescription
       | removeBlock         | message                                                                                                                                                         |
       | dosageInstructions  | MedicationRequest.dosageInstruction: minimum required = 1, but only found 0 (from https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-Message) |
       | quantity            | MedicationRequest.dispenseRequest.quantity: minimum required = 1, but only found 0 (from https://fhir.nhs.uk/StructureDefinition/NHSDigital-MedicationRequest-Message) |
-      | dm+d                | MedicationRequest.medication[x]: minimum required = 1, but only found 0 (from http://hl7.org/fhir/StructureDefinition/MedicationRequest)                        |
+      | dm+d                | MedicationRequest.medication[x]: minimum required = 1, but only found 0 (from http://hl7.org/fhir/StructureDefinition/MedicationRequest\|4.0.1)                        |
 
   Scenario Outline: Create line item prescription with additional instructions
     When I prepare 1 prescription(s) for FGC1 with details

diff --git a/packages/tool/azure/azure-build-pipeline.yml b/packages/tool/azure/azure-build-pipeline.yml
@@ -31,7 +31,7 @@ extends:
     cache_steps:
       - bash: |
           make prepare-for-epsat-release
-          VALIDATOR_VERSION=v1.0.200-alpha
+          VALIDATOR_VERSION=v1.0.205-alpha
           sed -i "s/{{ VALIDATOR_VERSION }}/$VALIDATOR_VERSION/g" ecs-proxies-deploy-int.yml
           sed -i "s/{{ VALIDATOR_VERSION }}/$VALIDATOR_VERSION/g" ecs-proxies-deploy-internal-dev-sandbox.yml
           sed -i "s/{{ VALIDATOR_VERSION }}/$VALIDATOR_VERSION/g" ecs-proxies-deploy-internal-qa.yml

diff --git a/packages/tool/e2e-tests/package.json b/packages/tool/e2e-tests/package.json
@@ -20,7 +20,7 @@
         "@types/lodash": "^4.17.12",
         "@types/selenium-webdriver": "^4.1.26",
         "@types/uuid": "^10.0.0",
-        "chromedriver": "^130.0.2",
+        "chromedriver": "^130.0.4",
         "geckodriver": "^5.0.0",
         "lodash": "^4.17.21",
         "selenium-webdriver": "^4.25.0",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ semver = "^3.0.2"
 gitpython = "^3.1.43"
 pytest = "^8.3.3"
 requests = "^2.32.3"
-boto3 = "^1.35.54"
+boto3 = "^1.35.56"
 argparse = "^1.4.0"
 pre-commit = "^3.5.0"