Fix pipeline and adjust Azure templates

Author: dlzhry2nhs

.github/workflows/continuous-deployment.yml

@@ -6,11 +6,34 @@ on:
       - master
 
 jobs:
-  deploy_all:
+  deploy-internal-dev:
+    uses: ./.github/workflows/deploy-backend.yml
+    with:
+      apigee_environment: internal-dev
+      create_mns_subscription: true
+      environment: dev
+      sub_environment: internal-dev
+
+  deploy-internal-dev-sandbox:
+    uses: ./.github/workflows/deploy-backend.yml
+    with:
+      apigee_environment: internal-dev-sandbox
+      environment: dev
+      sub_environment: internal-dev-sandbox
+
+  deploy-sandbox:
+    needs: [deploy-internal-dev-sandbox]
+    uses: ./.github/workflows/deploy-backend.yml
+    with:
+      apigee_environment: sandbox
+      environment: dev
+      sub_environment: sandbox
+
+  deploy-higher-dev-envs:
+    needs: [deploy-internal-dev]
     strategy:
       matrix:
-        sub_environment_name:
-          [internal-dev, internal-dev-sandbox, sandbox, ref, int]
+        sub_environment_name: [ref, int]
     uses: ./.github/workflows/deploy-backend.yml
     with:
       apigee_environment: ${{ matrix.sub_environment_name }}

.github/workflows/deploy-backend.yml

@@ -46,7 +46,6 @@ on:
 
 env: # Sonarcloud - do not allow direct usage of untrusted data
   APIGEE_ENVIRONMENT: ${{ inputs.apigee_environment }}
-  BACKEND_REQUIRED: ${{ !(inputs.apigee_environment == 'internal-dev-sandbox' || inputs.apigee_environment == 'sandbox') }}
   ENVIRONMENT: ${{ inputs.environment }}
   SUB_ENVIRONMENT: ${{ inputs.sub_environment }}
 
@@ -56,7 +55,7 @@ permissions:
 
 jobs:
   terraform-plan:
-    if: ${{ env.BACKEND_REQUIRED == 'true' }}
+    if: ${{ !(inputs.apigee_environment == 'internal-dev-sandbox' || inputs.apigee_environment == 'sandbox') }}
     runs-on: ubuntu-latest
     environment:
       name: ${{ inputs.environment }}
@@ -90,7 +89,7 @@ jobs:
           path: terraform/tfplan
 
   terraform-apply:
-    if: ${{ env.BACKEND_REQUIRED == 'true' }}
+    if: ${{ !(inputs.apigee_environment == 'internal-dev-sandbox' || inputs.apigee_environment == 'sandbox') }}
     needs: terraform-plan
     runs-on: ubuntu-latest
     environment:

Makefile

@@ -36,8 +36,7 @@ build-proxy:
 	scripts/build_proxy.sh
 
 #Files to loop over in release
-# VED-811: remove everything except for proxy related files as we move to Github Actions for backend deployment
-_dist_include="poetry.toml Makefile build/. specification sandbox scripts e2e"
+_dist_include="poetry.toml Makefile build/. specification sandbox scripts"
 
 #Create /dist/ sub-directory and copy files into directory
 #Ensure full dir structure is preserved for Lambdas

azure/azure-pr-pipeline.yml

@@ -40,5 +40,3 @@ extends:
         proxy_path: sandbox
         jinja_templates:
           DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
-        post_deploy:
-          - template: ./templates/sandbox-post-deploy.yml

azure/azure-release-pipeline.yml

@@ -38,17 +38,19 @@ extends:
         proxy_path: sandbox
         jinja_templates:
           DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
-        post_deploy:
-          - template: ./templates/sandbox-post-deploy.yml
       - environment: sandbox
         proxy_path: sandbox
         jinja_templates:
           DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
         depends_on:
           - internal_dev_sandbox
       - environment: ref
+        depends_on:
+          - internal_dev
         jinja_templates:
           DOMAIN_ENDPOINT: https://ref.imms.dev.vds.platform.nhs.uk
       - environment: int
+        depends_on:
+          - internal_dev
         jinja_templates:
           DOMAIN_ENDPOINT: https://int.imms.dev.vds.platform.nhs.uk