call validator lambda

.github/scripts/fix_cdk_json.sh

@@ -69,7 +69,6 @@ fix_string_key targetSpineServer "${TARGET_SPINE_SERVER}"
 fix_string_key logLevel "${LOG_LEVEL}"
 fix_string_key toAsid "${TO_ASID}"
 fix_string_key toPartyKey "${TO_PARTY_KEY}"
-fix_string_key validatorLogLevel "${VALIDATOR_LOG_LEVEL}"
 fix_string_key enableDefaultAsidPartyKey "${ENABLE_DEFAULT_ASID_PARTY_KEY}"
 fix_string_key defaultPTLAsid "${DEFAULT_PTL_ASID}"
 fix_string_key defaultPTLPartyKey "${DEFAULT_PTL_PARTY_KEY}"

.github/workflows/cdk_package_code.yml

@@ -74,25 +74,6 @@ jobs:
           docker build -t "fhir-facade-repo:${{ inputs.VERSION_NUMBER }}" -f packages/coordinator/Dockerfile .
           docker save "fhir-facade-repo:${{ inputs.VERSION_NUMBER }}" -o FHIR_facade_docker.img
 
-      - name: get latest validator release
-        id: get_latest_validator_release
-        run: |
-          LATEST_VALIDATOR_VERSION=v1.0.311-alpha
-          echo "LATEST_VALIDATOR_VERSION=${LATEST_VALIDATOR_VERSION}" >> "$GITHUB_ENV"
-
-      - name: Download Dockerfile, manifest.json and JAR file for Validator
-        run: |
-          curl -L -o Dockerfile "https://github.com/NHSDigital/validation-service-fhir-r4/releases/download/${{ env.LATEST_VALIDATOR_VERSION }}/Dockerfile"
-          curl -L -o manifest.json "https://github.com/NHSDigital/validation-service-fhir-r4/releases/download/${{ env.LATEST_VALIDATOR_VERSION }}/manifest.json"
-          curl -L -o fhir-validator.jar "https://github.com/NHSDigital/validation-service-fhir-r4/releases/download/${{ env.LATEST_VALIDATOR_VERSION }}/fhir-validator.jar"
-
-      - name: Build Validator Docker image
-        id: build-validator-image
-        run: |
-          docker build -t "validator-repo:${{ inputs.VERSION_NUMBER }}" -f Dockerfile .
-          docker images
-          docker save "validator-repo:${{ inputs.VERSION_NUMBER }}" -o validator_docker.img
-
       - name: "package cdk"
         run: |
           tar -rf artifact.tar \
@@ -117,4 +98,3 @@ jobs:
           name: docker_artifact
           path: |
             FHIR_facade_docker.img
-            validator_docker.img

.github/workflows/cdk_release_code.yml

@@ -27,10 +27,6 @@ on:
       LOG_LEVEL:
         required: true
         type: string
-      VALIDATOR_LOG_LEVEL:
-        required: false
-        type: string
-        default: INFO
       LOG_RETENTION_DAYS:
         required: true
         type: string
@@ -184,11 +180,6 @@ jobs:
         run: |
           docker load -i FHIR_facade_docker.img
 
-      - name: Extract validator docker image
-        id: extract-validator-image
-        run: |
-          docker load -i validator_docker.img
-
       - name: extract build_artifact
         run: |
           mkdir -p .build
@@ -217,11 +208,6 @@ jobs:
           docker tag "fhir-facade-repo:${{ inputs.VERSION_NUMBER }}" "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/fhir-facade-repo:${{ inputs.DOCKER_IMAGE_TAG }}"
           docker push "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/fhir-facade-repo:${{ inputs.DOCKER_IMAGE_TAG }}"
 
-      - name: Push Validator image to Amazon ECR
-        run: |
-          docker tag "validator-repo:${{ inputs.VERSION_NUMBER }}" "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/validator-repo:${{ inputs.DOCKER_IMAGE_TAG }}"
-          docker push "${{ env.ACCOUNT_ID }}.dkr.ecr.eu-west-2.amazonaws.com/validator-repo:${{ inputs.DOCKER_IMAGE_TAG }}"
-
       - name: Check fhir facade scan results
         env:
           REPOSITORY_NAME: fhir-facade-repo
@@ -230,14 +216,6 @@ jobs:
         run: |
           ./check_ecr_image_scan_results.sh
 
-      - name: Check validator scan results
-        env:
-          REPOSITORY_NAME: validator-repo
-          IMAGE_TAG: ${{ inputs.DOCKER_IMAGE_TAG }}
-        working-directory: .github/scripts
-        run: |
-          ./check_ecr_image_scan_results.sh
-
       - name: fix cdk.json for deployment
         run: |
           ./.github/scripts/fix_cdk_json.sh
@@ -252,7 +230,6 @@ jobs:
           LOG_LEVEL: "${{ inputs.LOG_LEVEL }}"
           TO_ASID: "${{ inputs.TO_ASID }}"
           TO_PARTY_KEY: "${{ inputs.TO_PARTY_KEY }}"
-          VALIDATOR_LOG_LEVEL: "${{ inputs.VALIDATOR_LOG_LEVEL }}"
           ENABLE_DEFAULT_ASID_PARTY_KEY: "${{ inputs.ENABLE_DEFAULT_ASID_PARTY_KEY }}"
           DEFAULT_PTL_ASID: "${{ secrets.DEFAULT_PTL_ASID }}"
           DEFAULT_PTL_PARTY_KEY: "${{ secrets.DEFAULT_PTL_PARTY_KEY }}"

.github/workflows/pull_request.yml

@@ -98,7 +98,7 @@ jobs:
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
 
-  release_code:
+  release_dev:
     needs: [get_issue_number, package_code, get_commit_id]
     uses: ./.github/workflows/cdk_release_code.yml
     with:
@@ -110,7 +110,6 @@ jobs:
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: msg.veit07.devspineservices.nhs.uk
@@ -154,7 +153,6 @@ jobs:
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: unused

.github/workflows/release.yml

@@ -89,7 +89,6 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       # CREATE_INT_RELEASE_NOTES: true
@@ -139,7 +138,6 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: unused
@@ -190,7 +188,6 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: prescriptions.refspineservices.nhs.uk
@@ -237,7 +234,6 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: msg.intspineservices.nhs.uk
@@ -281,7 +277,6 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: msg.intspineservices.nhs.uk
@@ -331,7 +326,6 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: unused
@@ -372,7 +366,6 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{needs.get_commit_id.outputs.commit_id}}
       LOG_LEVEL: info
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 731
       # MARK_JIRA_RELEASED: true
       # CREATE_PROD_RELEASE_NOTES: true

.github/workflows/release_ref.yml

@@ -57,7 +57,6 @@ jobs:
       VERSION_NUMBER: ${{ inputs.versionNumber }}
       COMMIT_ID: ${{ inputs.commitId}}
       LOG_LEVEL: debug
-      VALIDATOR_LOG_LEVEL: INFO
       LOG_RETENTION_DAYS: 30
       DEPLOY_APIGEE: true
       TARGET_SPINE_SERVER: prescriptions.refspineservices.nhs.uk

cdk.json

@@ -85,7 +85,6 @@
     "logLevel": "foo",
     "toAsid": "foo",
     "toPartyKey": "foo",
-    "validatorLogLevel": "foo",
     "enableDefaultAsidPartyKey": "foo",
     "defaultPTLAsid": "foo",
     "defaultPTLPartyKey": "foo",