Merge branch 'master' into dependabot/npm_and_yarn/multi-170d91aa79

Author: axelkrastek1-nhs

.github/workflows/continuous-integration-workflow.yaml

@@ -12,10 +12,10 @@ jobs:
         with:
           fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
 
-      - name: Install Python 3.9
+      - name: Install Python 3.13
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: 3.13
 
       - name: Update apt repositories
         run: sudo apt update
@@ -70,6 +70,9 @@ jobs:
       - name: Run custom attribute reporter pytests
         run: make test-custom-attribute-reporter
 
+      - name: Generate examples
+        run: make generate-examples
+
       - name: Check resources are valid FHIR 4.0.1
         run: make validate
 

.gitignore

@@ -14,6 +14,7 @@ venv
 .env
 *.code-workspace
 .tool-versions
+.venv
 
 __pycache__/
 .envrc
@@ -27,6 +28,10 @@ tests/docker.env
 tests/*.key
 tests/.pytest_cache
 
+
+keys.zip
+ssocli-bundle.zip
+
 scripts/custom_attribute_reporter/output/
 
 ID_TOKEN_NHS_LOGIN_PRIVATE_KEY
@@ -39,3 +44,8 @@ keys/
 karate.jar
 
 newman-test-report.xml
+git
+keys.zip:Zone.Identifier
+tests/scripts/get_token
+tests/scripts/acurl
+tests/scripts/install

.python-version

@@ -1 +1 @@
-3.9
+3.13

Makefile

@@ -12,9 +12,9 @@ install-node:
 install-hooks:
 	cp scripts/pre-commit .git/hooks/pre-commit
 
-install-fhir-validator:
-	mkdir -p bin
-	test -f bin/org.hl7.fhir.validator.jar || curl -L https://github.com/hapifhir/org.hl7.fhir.core/releases/latest/download/validator_cli.jar > bin/org.hl7.fhir.validator.jar
+BIN_DIR := bin
+FHIR_VALIDATOR := $(BIN_DIR)/validator_cli.jar
+FHIR_VALIDATOR_URL := https://github.com/hapifhir/org.hl7.fhir.core/releases/download/6.7.9/validator_cli.jar
 
 karate:
 	cd karate-tests && mvn clean test -Dtest=TestParallel
@@ -25,8 +25,17 @@ lint:
 	find . -name '*.py' | xargs poetry run flake8
 	find . -name '*.sh' | grep -v node_modules | xargs shellcheck
 
-validate: generate-examples
-	java -jar bin/org.hl7.fhir.validator.jar build/examples/**/*application_fhir+json*.json -version 4.0.1 -tx n/a -extension any | tee /tmp/validation.txt
+install-fhir-validator:
+	@mkdir -p $(BIN_DIR)
+	@if [ ! -s "$(FHIR_VALIDATOR)" ]; then \
+		echo "Downloading FHIR validator: $(FHIR_VALIDATOR_URL)"; \
+		curl -fSL "$(FHIR_VALIDATOR_URL)" -o "$(FHIR_VALIDATOR)"; \
+	fi
+	@test -s "$(FHIR_VALIDATOR)" || (echo "Validator jar missing or empty"; exit 1)
+
+validate: install-fhir-validator
+	@echo "Validating examples..."
+	java -jar "$(FHIR_VALIDATOR)" build/examples/**/*application_fhir+json*.json -version 4.0.1 -tx n/a -extension any | tee /tmp/validation.txt
 
 prism: publish
 	prism proxy build/personal-demographics.json ${OAUTH_BASE_URI}/${PDS_BASE_PATH} --errors --validate-request false

azure/azure-build-pipeline.yml

@@ -30,6 +30,7 @@ resources:
 
 variables:
   - template: project.yml
+
 extends:
   template: azure/common/apigee-build.yml@common
   parameters:
@@ -40,12 +41,17 @@ extends:
       PIP_CACHE_DIR: ".poetry"
     test_steps:
       - template: templates/install-jdk.yml
-
       - bash: "make sandbox &"
         displayName: Start Sandbox Server
         workingDirectory: "${{ variables.service_name }}"
-
       - bash: |
+          set -eux
+          # Build spec and examples
+          make publish
+          make generate-examples
+          # Fetch validator and validate
+          make install-fhir-validator
+          ls -lh bin build build/examples || true
           java -version
           make validate
         displayName: Validate FHIR

azure/azure-pr-pipeline.yml

@@ -45,11 +45,15 @@ extends:
           - template: templates/install-jdk.yml
         post_deploy:
           - template: templates/pds-tests-karate.yml
+            parameters:
+              python_version: ${{ variables.python_version }}
 
       - environment: internal-dev
         stage_name: pytest_bdd_tests
         post_deploy:
           - template: templates/pds-tests.yml
+            parameters:
+              python_version: ${{ variables.python_version }}
         depends_on:
           - karate_tests
 
@@ -60,7 +64,9 @@ extends:
           - template: templates/install-jdk.yml
         post_deploy:
           - template: templates/sandbox-tests.yml
-          
+            parameters:
+              python_version: ${{ variables.python_version }}
+
       - environment: internal-dev
         service_name: ${{ variables.service_name }}-int
         short_service_name: ${{ variables.short_service_name }}-int
@@ -70,6 +76,8 @@ extends:
           - template: templates/install-jdk.yml
         post_deploy:
            - template: templates/pds-tests-dev-int.yml  
+             parameters:
+               python_version: ${{ variables.python_version }}
         jinja_templates:
           PDS_TARGET_SERVER: spine-demographics-int
           REQUIRE_ASID: false

azure/azure-release-pipeline.yml

@@ -41,21 +41,29 @@ extends:
       RATE_LIMIT_POST: true
     apigee_deployments:
       - environment: internal-dev
+        pre_deploy:
+          - template: templates/install-jdk.yml
         post_deploy:
           - template: templates/pds-tests-dev.yml
       # only deploy to other environments if the build was NOT a daily overnight build
       - ${{ if ne(variables['resources.pipeline.build_pipeline.triggerReason'], 'Schedule') }}:
           - environment: internal-qa-sandbox
             enable_status_monitoring: false
             proxy_path: sandbox
+            pre_deploy:
+              - template: templates/install-jdk.yml
             post_deploy:
               - template: templates/sandbox-tests.yml
+
           - environment: int
+            pre_deploy:
+              - template: templates/install-jdk.yml
             post_deploy:
               - template: templates/pds-tests-int.yml
             depends_on:
               - internal_dev
               - internal_qa_sandbox
+
           - environment: ref
             enable_status_monitoring: false # revert when /_status implemented or endpoint updated
             depends_on:
@@ -65,14 +73,18 @@ extends:
               REQUIRE_ASID: false
               PDS_TARGET_SERVER: spine-demographics
               RATE_LIMIT_POST: false
+
           - environment: sandbox
             proxy_path: sandbox
             enable_status_monitoring: false
+            pre_deploy:
+              - template: templates/install-jdk.yml
             post_deploy:
               - template: templates/sandbox-tests.yml
             depends_on:
               - internal_dev
               - internal_qa_sandbox
+              
           - environment: prod
             depends_on:
               - internal_dev

azure/project.yml

@@ -5,4 +5,4 @@ variables:
   product_display_name: Personal Demographics Service
   product_description: " "
   spec_file: personal-demographics.json
-  python_version: 3.9
+  python_version: 3.13

azure/templates/pds-tests.yml

@@ -22,6 +22,13 @@ steps:
       testResultsFiles: $(ARTIFACT_PATH)/tests/functional-test-report.xml
       failTaskOnFailedTests: true
 
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish application restricted test results as an artifact'
+    condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues', 'Failed')
+    inputs:
+      targetPath: $(ARTIFACT_PATH)/tests/functional-test-report.xml
+      artifact: pytestFunctionalTestReport    
+
   - bash: |
       export APIGEE_API_TOKEN="$(secret.AccessToken)"
       export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
@@ -38,6 +45,13 @@ steps:
       testResultsFiles: $(ARTIFACT_PATH)/tests/proxy-behaviour-test-report.xml
       failTaskOnFailedTests: true
 
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish proxy behaviour test results as an artifact'
+    condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues', 'Failed')
+    inputs:
+      targetPath: $(ARTIFACT_PATH)/tests/proxy-behaviour-test-report.xml
+      artifact: proxyBehaviourTestReport       
+
   - bash: |
       export APIGEE_API_TOKEN="$(secret.AccessToken)"
       export APIGEE_ACCESS_TOKEN="$(secret.AccessToken)"
@@ -53,6 +67,12 @@ steps:
     inputs:
       testResultsFiles: $(ARTIFACT_PATH)/tests/sync-wrap-test-report.xml
       failTaskOnFailedTests: true
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish sync wrap test results as an artifact'
+    condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues', 'Failed')
+    inputs:
+      targetPath: $(ARTIFACT_PATH)/tests/sync-wrap-test-report.xml
+      artifact: syncwrapTestReport      
 
   - bash: |
       export APIGEE_API_TOKEN="$(secret.AccessToken)"
@@ -71,6 +91,13 @@ steps:
     inputs:
       testResultsFiles: $(ARTIFACT_PATH)/tests/patient-create-test-report.xml
       failTaskOnFailedTests: true
+   
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish post patient test results as an artifact'
+    condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues', 'Failed')
+    inputs:
+      targetPath: $(ARTIFACT_PATH)/tests/patient-create-test-report.xml
+      artifact: postPatientTestReport     
 
   - bash: |
       export APIGEE_API_TOKEN="$(secret.AccessToken)"
@@ -89,3 +116,10 @@ steps:
     inputs:
       testResultsFiles: $(ARTIFACT_PATH)/tests/patient-access-test-report.xml
       failTaskOnFailedTests: true
+
+  - task: PublishPipelineArtifact@1
+    displayName: 'Publish patient access test results as an artifact'
+    condition: in(variables['Agent.JobStatus'], 'Succeeded', 'SucceededWithIssues', 'Failed')
+    inputs:
+      targetPath: $(ARTIFACT_PATH)/tests/patient-access-test-report.xml
+      artifact: patientAccessTestReport     

karate-tests/README.md

@@ -117,7 +117,7 @@ We have a Dockerfile set up for the sandbox. You can build the image from this D
     ```
 1. If you run the container you'll see the Karate mockserver logs
     ```bash
-    docker run --name karate-sandbox -p 9000:9000 nhs/pds-sandbox
+    docker run --name karate-sandbox -p 9001:9000 nhs/pds-sandbox
     ```
 1. Inspect the running container to discover its IP address:
     ```bash