From b3e2172b720b6821f197cb5d917879eb21cdee32 Mon Sep 17 00:00:00 2001
From: Stephen Hand <steveh@techmatters.org>
Date: Thu, 24 Oct 2024 09:08:39 +0100
Subject: [PATCH 1/2] Revert self host plugin on deploy (just in case we are
 rolling back from a v2.18+ self host

---
 .github/workflows/flex-deploy.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/flex-deploy.yml b/.github/workflows/flex-deploy.yml
index da0583557f..9e637791b9 100644
--- a/.github/workflows/flex-deploy.yml
+++ b/.github/workflows/flex-deploy.yml
@@ -83,7 +83,16 @@ jobs:
         with:
           ssm_parameter: "/${{env.ENVIRONMENT_NAME}}/twilio/${{env.TWILIO_ACCOUNT_SID}}/auth_token"
           env_variable_name: "TWILIO_AUTH_TOKEN"
-
+      - name: Configure Account to use Twilio Hosted Plugin
+        shell: bash
+        run: |
+          curl --location 'https://flex-api.twilio.com/v1/Configuration' \
+          --header 'Content-Type: application/json' \
+          -u '${{env.TWILIO_ACCOUNT_SID}}:${{env.TWILIO_AUTH_TOKEN}}' \
+          --data '{
+              "account_sid": "${{env.TWILIO_ACCOUNT_SID}}",
+              "plugin_service_attributes":null
+          }'
       # Call main-action to compile and deploy secrets.AS_DEV_ACCOUNT_SID
       - name: Executing main-action
         uses: ./.github/actions/main-action

From 63a5a6607fe822203ac7a7f02ca573c4575f7232 Mon Sep 17 00:00:00 2001
From: Stephen Hand <steveh@techmatters.org>
Date: Thu, 31 Oct 2024 17:20:28 +0000
Subject: [PATCH 2/2] Revert "Revert self host plugin on deploy (just in case
 we are rolling back from a v2.18+ self host"

This reverts commit b3e2172b720b6821f197cb5d917879eb21cdee32.
---
 .github/workflows/flex-deploy.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/flex-deploy.yml b/.github/workflows/flex-deploy.yml
index fc154cdc11..c0301526c1 100644
--- a/.github/workflows/flex-deploy.yml
+++ b/.github/workflows/flex-deploy.yml
@@ -96,16 +96,7 @@ jobs:
         with:
           ssm_parameter: "/${{env.ENVIRONMENT_NAME}}/twilio/${{env.TWILIO_ACCOUNT_SID}}/auth_token"
           env_variable_name: "TWILIO_AUTH_TOKEN"
-      - name: Configure Account to use Twilio Hosted Plugin
-        shell: bash
-        run: |
-          curl --location 'https://flex-api.twilio.com/v1/Configuration' \
-          --header 'Content-Type: application/json' \
-          -u '${{env.TWILIO_ACCOUNT_SID}}:${{env.TWILIO_AUTH_TOKEN}}' \
-          --data '{
-              "account_sid": "${{env.TWILIO_ACCOUNT_SID}}",
-              "plugin_service_attributes":null
-          }'
+
       # Call main-action to compile and deploy secrets.AS_DEV_ACCOUNT_SID
       - if: env.SELF_HOSTED_DEPLOY != 'true'
         name: Executing main-action