Merge pull request #494 from NHSDigital/master

MergeMasterToEdge

Author: NautiyalVikas1

.github/workflows/publish.yml

@@ -5,17 +5,17 @@ on: push
 jobs:
     build:
         name: calculate version
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout
               uses: actions/checkout@v2
               with:
                   fetch-depth: 0  # This causes all history to be fetched, which is required for calculate-version to function
 
-            - name: Install Python 3.8
-              uses: actions/setup-python@v1
+            - name: Install Python 3.9
+              uses: actions/setup-python@v5
               with:
-                  python-version: 3.8
+                  python-version: 3.9
 
             - name: Install poetry
               run: pip install poetry

ansible/roles/deploy-ecs-proxies/vars/main.yml

@@ -9,7 +9,7 @@ workspace: "api-deployment:{{ account }}:{{ apigee_environment }}:{{ service_id
 service_cpu: "{{ docker_service_cpu | default(256) }}"
 service_memory: "{{ docker_service_memory | default(512) }}"
 do_not_terraform: "{{ lookup('env','do_not_terraform') }}"
-default_desired_capacity: "{{ 2 if apigee_environment in ('prod', 'ref') else 1  }}"
+default_desired_capacity: "{{ docker_service_desired_capacity | 2 if apigee_environment in ('prod', 'ref') else 1  }}"
 autoscaling_policy: "{{ docker_service_autoscaling | default({}) | as_ecs_autoscaling }}"
 health_check_grace_period_seconds: "{{ docker_service_health_check_grace_period_seconds | default(60) }}"
 deregistration_delay: "{{ docker_service_dereg_delay | default(120) }}"