Release 2025-12-15

Makefile

@@ -28,6 +28,7 @@ clean:
 	rm -rf dist
 
 publish: clean
+	python --version
 	mkdir -p build
 	npm run publish 2> /dev/null
 

azure/azure-build-pipeline.yml

@@ -1,43 +1,55 @@
 name: "$(SourceBranchName)+$(BuildID)"
 
 trigger:
-  branches:
-    include:
-      - tags/refs/v*
-  tags:
-    include:
-      - v*
+    branches:
+        include:
+            - tags/refs/v*
+    tags:
+        include:
+            - v*
 
 pr:
-  branches:
-    include: ['*']
+    branches:
+        include: ["*"]
 
 resources:
-  repositories:
-    - repository: common
-      type: github
-      name: NHSDigital/api-management-utils
-      ref: refs/heads/edge
-      endpoint: NHSDigital
+    repositories:
+        - repository: common
+          type: github
+          name: NHSDigital/api-management-utils
+          ref: refs/heads/edge
+          endpoint: NHSDigital
 
 variables:
-  - template: project.yml
+    - template: project.yml
 
 extends:
-  template: azure/common/apigee-build.yml@common
-  parameters:
-    service_name: ${{ variables.service_name }}
-    short_service_name: ${{ variables.short_service_name }}
-    cache_steps:
-        - task: s3-cache-action@1
-          inputs:
-            key: 'node modules | ${{ variables.service_name }} | ${{ variables.service_name }}/package-lock.json'
-            location: '${{ variables.service_name }}/node_modules'
-            debug: true
-          displayName: cache node modules
-        - task: s3-cache-action@1
-          inputs:
-            key: 'poetry | ${{ variables.service_name }} | ${{ variables.service_name }}/poetry.lock'
-            location: '${{ variables.service_name }}/.venv'
-            debug: true
-          displayName: cache python dependencies
+    template: azure/common/apigee-build.yml@common
+
+    parameters:
+        python_version: ${{ variables.python_version }}
+        service_name: ${{ variables.service_name }}
+        short_service_name: ${{ variables.short_service_name }}
+        cache_steps:
+            - bash: |
+                  echo "Resolved latest python version: 3.8.10"
+                  echo "##vso[task.setvariable variable=LD_LIBRARY_PATH;]/agent/_work/_tool/Python/3.8.10/x64/lib/"
+              displayName: "Query and set python tool cache path"
+
+            - task: UsePythonVersion@0
+              displayName: "Use Python ${{ variables.python_version }}"
+              inputs:
+                  versionSpec: ${{ variables.python_version }}
+
+            - task: s3-cache-action@1
+              inputs:
+                  key: "node modules | ${{ variables.service_name }} | ${{ variables.service_name }}/package-lock.json"
+                  location: "${{ variables.service_name }}/node_modules"
+                  debug: true
+              displayName: cache node modules
+            - task: s3-cache-action@1
+              inputs:
+                  key: "poetry | ${{ variables.service_name }} | ${{ variables.service_name }}/poetry.lock"
+                  location: "${{ variables.service_name }}/.venv"
+                  debug: true
+              displayName: cache python dependencies

azure/azure-pr-pipeline.yml

@@ -4,57 +4,65 @@ trigger: none
 pr: none
 
 resources:
-  repositories:
-    - repository: common
-      type: github
-      name: NHSDigital/api-management-utils
-      ref: refs/heads/edge
-      endpoint: NHSDigital
-  pipelines:
-  - pipeline: build_pipeline
-    source: "Spine-Directory-Service-Build"
-    trigger:
-      branches:
-        exclude:
-          - master
-          - refs/heads/master
-          - refs/tags/v*
+    repositories:
+        - repository: common
+          type: github
+          name: NHSDigital/api-management-utils
+          ref: refs/heads/edge
+          endpoint: NHSDigital
+    pipelines:
+        - pipeline: build_pipeline
+          source: "Spine-Directory-Service-Build"
+          trigger:
+              branches:
+                  exclude:
+                      - master
+                      - refs/heads/master
+                      - refs/tags/v*
 
 pool:
-  name: 'AWS-ECS'
+    name: "AWS-ECS"
 
 variables:
-  - template: project.yml
+    - template: project.yml
 
 extends:
-  template: azure/common/apigee-deployment.yml@common
-  parameters:
-    service_name: ${{ variables.service_name }}
-    service_base_path: ${{ variables.service_base_path }}
-    short_service_name: ${{ variables.short_service_name }}
-    deploy_review_sandbox: true
-    secret_ids:
-      - ptl/client/ldap.nis1.national.ncrs.nhs.uk/key
-      - ptl/client/ldap.nis1.national.ncrs.nhs.uk/crt
-      - ptl/veit07.devspineservices.nhs.uk/root-ca/crt
-    config_ids:
-      - /ptl/api-deployment/sds/ldap/private-key
-      - /ptl/api-deployment/sds/ldap/client-cert
-      - /ptl/api-deployment/sds/ldap/ca-certs
-    jinja_templates:
-    hosted_target_healthcheck_suffix: /healthcheck/deep
-    apigee_deployments:
-      - environment: internal-dev
-        post_deploy:
-          - template: ./templates/run-tests.yml
-            parameters:
-              e2e_tests: true
-              smoke_tests: true
-              security_tests: true
-      - environment: internal-dev-sandbox
-        proxy_path: sandbox
-        post_deploy:
-          - template: ./templates/run-tests.yml
-            parameters:
-              e2e_tests: true
-              smoke_tests: true
+    template: azure/common/apigee-deployment.yml@common
+    parameters:
+        service_name: ${{ variables.service_name }}
+        service_base_path: ${{ variables.service_base_path }}
+        short_service_name: ${{ variables.short_service_name }}
+        deploy_review_sandbox: true
+        secret_ids:
+            - ptl/client/ldap.nis1.national.ncrs.nhs.uk/key
+            - ptl/client/ldap.nis1.national.ncrs.nhs.uk/crt
+            - ptl/veit07.devspineservices.nhs.uk/root-ca/crt
+        config_ids:
+            - /ptl/api-deployment/sds/ldap/private-key
+            - /ptl/api-deployment/sds/ldap/client-cert
+            - /ptl/api-deployment/sds/ldap/ca-certs
+        jinja_templates:
+        hosted_target_healthcheck_suffix: /healthcheck/deep
+        apigee_deployments:
+            - environment: internal-dev
+              pre_deploy:
+                  parameters:
+                      python_version: ${{ variables.python_version }}
+              post_deploy:
+                  - template: ./templates/run-tests.yml
+                    parameters:
+                        e2e_tests: true
+                        smoke_tests: true
+                        security_tests: true
+                        python_version: ${{ variables.python_version }}
+            - environment: internal-dev-sandbox
+              proxy_path: sandbox
+              pre_deploy:
+                  parameters:
+                      python_version: ${{ variables.python_version }}
+              post_deploy:
+                  - template: ./templates/run-tests.yml
+                    parameters:
+                        e2e_tests: true
+                        smoke_tests: true
+                        python_version: ${{ variables.python_version }}