Merge pull request #613 from NHSDigital/master

Merge Master to edge

Author: sathiya-nhs

azure/cleanup-ecs-pr-proxies.yml

@@ -52,13 +52,6 @@ jobs:
           tfenv use 1.2.3
         displayName: setup terraform
 
-      - task: s3-cache-action@1.3.4
-        inputs:
-          key: poetry | utils | poetry.lock
-          location: ".venv"
-          debug: true
-        displayName: cache utils pre-requisites
-
       - bash: |
           pyversion="3.13"
           PATCH=$(curl -fsSL https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json \

azure/cleanup-pr-portal-apis-and-specs.yml

@@ -42,18 +42,9 @@ jobs:
           tfenv use 0.14.6
         displayName: setup terraform
 
-      - task: s3-cache-action@1.3.4
-        inputs:
-          key: poetry | utils | poetry.lock
-          location: ".venv"
-          debug: true
-          alias: "Utils"
-        displayName: cache utils pre-requisites
-
       - bash: |
           make install
         displayName: install dependencies
-        condition: ne(variables['CacheRestored-Utils'], 'true')
 
       - template: ./components/get-aws-secrets-and-ssm-params.yml
         parameters:

azure/common/apigee-build.yml

@@ -163,9 +163,6 @@ jobs:
         inputs:
           versionSpec: "$(PY_VER)"
 
-      - ${{ each cache_step in parameters.cache_steps }}:
-          - ${{ cache_step }}
-
       - bash: |
           n=0
           until [ "$n" -ge 3 ]
@@ -203,19 +200,10 @@ jobs:
       - checkout: common
         path: "s/${{ parameters.service_name }}/utils"
 
-      - task: s3-cache-action@1.3.4
-        inputs:
-          key: poetry | $(System.DefaultWorkingDirectory) | ${{ parameters.service_name }}/utils/poetry.lock
-          location: "${{ parameters.service_name }}/utils/.venv"
-          debug: true
-          alias: "Utils"
-        displayName: cache utils dependencies
-
       - bash: |
           make install
           sleep 5
         workingDirectory: "${{ parameters.service_name }}/utils"
-        condition: ne(variables['CacheRestored-Utils'], 'true')
         displayName: "Install utils "
 
       - bash: |

azure/components/remove-target-proxy.yml

@@ -46,13 +46,6 @@ stages:
 
                 - template: ./print-aws-info.yml
 
-                - task: s3-cache-action@1.3.4
-                  inputs:
-                    key: poetry | utils | poetry.lock
-                    location: ".venv"
-                    debug: true
-                  displayName: cache utils pre-requisites
-
                 - bash: make install
                   displayName: Install project dependencies
 

azure/templates/deploy-service.yml

@@ -71,14 +71,6 @@ steps:
       apigee_environment: ${{ parameters.apigee_environment }}
     displayName: "Check for ECS proxy definitions"
 
-  - task: s3-cache-action@1.3.4
-    inputs:
-      key: poetry | utils | $(UTILS_DIR)/poetry.lock
-      location: "$(UTILS_DIR)/.venv"
-      debug: true
-      alias: "UtilsPreReq"
-    displayName: cache utils pre-requisites
-
   - bash: |
       n=0
       until [ "$n" -ge 3 ]
@@ -87,7 +79,6 @@ steps:
         n=$((n+1))
       done
     workingDirectory: "$(UTILS_DIR)"
-    condition: ne(variables['CacheRestored-UtilsPreReq'], 'true')
     displayName: "Install utils pre-requisites"
 
   - bash: |