From 21d96d97adcf69cf9531c8397dbea7996fb38bac Mon Sep 17 00:00:00 2001
From: Yuval Yaron <yuvalyaron@microsoft.com>
Date: Mon, 27 Mar 2023 13:02:20 +0000
Subject: [PATCH] move conversion of azure_env to arm_env to script and source
 it

---
 .github/actions/devcontainer_run_command/action.yml |  6 +++---
 devops/scripts/construct_tre_url.sh                 |  1 -
 devops/scripts/convert_azure_env_to_arm_env.sh      | 13 +++++++++++++
 devops/scripts/load_and_validate_env.sh             |  9 +++++----
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 devops/scripts/convert_azure_env_to_arm_env.sh

diff --git a/.github/actions/devcontainer_run_command/action.yml b/.github/actions/devcontainer_run_command/action.yml
index 0453aab737..f6c501e1f9 100644
--- a/.github/actions/devcontainer_run_command/action.yml
+++ b/.github/actions/devcontainer_run_command/action.yml
@@ -150,9 +150,9 @@ runs:
     - name: Construct ARM_ENVIRONMENT
       shell: bash
       run: |
-        declare -A arm_envs=( ["AzureCloud"]="public" ["AzureUSGovernment"]="usgovernment")
-        azure_env="${{ env.AZURE_ENVIRONMENT }}"
-        echo "ARM_ENVIRONMENT=${arm_envs[${azure_env}]}" >> $GITHUB_ENV
+        source devops/scripts/convert_azure_env_to_arm_env.sh
+        arm_environment=$(convert_azure_env_to_arm_env "${{ env.AZURE_ENVIRONMENT }}")
+        echo "ARM_ENVIRONMENT=$arm_environment" >> $GITHUB_ENV
 
     - name: Construct ACR Domain Suffix
       shell: bash
diff --git a/devops/scripts/construct_tre_url.sh b/devops/scripts/construct_tre_url.sh
index e98001387d..b7a0904fff 100644
--- a/devops/scripts/construct_tre_url.sh
+++ b/devops/scripts/construct_tre_url.sh
@@ -5,7 +5,6 @@ set -o nounset
 
 # This script is designed to be `source`d to create reusable helper functions
 
-# This script
 function construct_tre_url()
 {
   tre_id=$1
diff --git a/devops/scripts/convert_azure_env_to_arm_env.sh b/devops/scripts/convert_azure_env_to_arm_env.sh
new file mode 100644
index 0000000000..4922e54b50
--- /dev/null
+++ b/devops/scripts/convert_azure_env_to_arm_env.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -o errexit
+set -o pipefail
+set -o nounset
+
+# This script is designed to be `source`d to create reusable helper functions
+
+function convert_azure_env_to_arm_env()
+{
+  azure_environment=$1
+  declare -A arm_envs=( ["AzureCloud"]="public" ["AzureUSGovernment"]="usgovernment")
+  echo "${arm_envs[${azure_environment}]}"
+}
diff --git a/devops/scripts/load_and_validate_env.sh b/devops/scripts/load_and_validate_env.sh
index 2eacb335bf..9432358fe9 100755
--- a/devops/scripts/load_and_validate_env.sh
+++ b/devops/scripts/load_and_validate_env.sh
@@ -10,6 +10,8 @@ set -o nounset
 
 # shellcheck disable=SC1091
 source "${DIR}"/construct_tre_url.sh
+# shellcheck disable=SC1091
+source "${DIR}"/convert_azure_env_to_arm_env.sh
 
 if [ ! -f "config.yaml" ]; then
   if [ -z "${USE_ENV_VARS_NOT_FILES:-}" ]; then
@@ -50,11 +52,10 @@ else
     AZURE_ENVIRONMENT=$(az cloud show --query name --output tsv)
     export AZURE_ENVIRONMENT
 
-    declare -A arm_environments=( ["AzureCloud"]="public" ["AzureUSGovernment"]="usgovernment")
-
     # The ARM Environment is required by terrafform to indicate the destination cloud.
-    export ARM_ENVIRONMENT="${arm_environments[${AZURE_ENVIRONMENT}]}"
-    export TF_VAR_arm_environment="${arm_environments[${AZURE_ENVIRONMENT}]}"
+    ARM_ENVIRONMENT=$(convert_azure_env_to_arm_env "${AZURE_ENVIRONMENT}")
+    export ARM_ENVIRONMENT
+    export TF_VAR_arm_environment="${ARM_ENVIRONMENT}"
 
     TRE_URL=$(construct_tre_url "${TRE_ID}" "${LOCATION}" "${AZURE_ENVIRONMENT}")
     export TRE_URL