From 3b86a377eedf4dc4b9b0c666d49a153d8776fa76 Mon Sep 17 00:00:00 2001
From: Maksim Petrov <v-mapetr@microsoft.com>
Date: Sat, 27 Jun 2020 04:55:49 +0300
Subject: [PATCH 1/3] Add Az 4.3.0 for Ubuntu

---
 images/linux/scripts/installers/azpowershell.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh
index cfe901bf5..43a3703eb 100644
--- a/images/linux/scripts/installers/azpowershell.sh
+++ b/images/linux/scripts/installers/azpowershell.sh
@@ -12,7 +12,7 @@ source $HELPER_SCRIPTS/os.sh
 if isUbuntu20 ; then
     versions=$(pwsh -Command '(Find-Module -Name Az).Version')
 else
-    versions=(1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0)
+    versions=(1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0)
 fi
 
 # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)

From 52610e17badb4542a406580b162e6d0be1331d62 Mon Sep 17 00:00:00 2001
From: Maksim Petrov <v-mapetr@microsoft.com>
Date: Sun, 28 Jun 2020 21:03:34 +0300
Subject: [PATCH 2/3] Move azpowershell versions to toolset

---
 images/linux/scripts/installers/azpowershell.sh |  3 ++-
 images/linux/toolset-1604.json                  | 16 ++++++++++++++++
 images/linux/toolset-1804.json                  | 16 ++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh
index 43a3703eb..6cd4e2211 100644
--- a/images/linux/scripts/installers/azpowershell.sh
+++ b/images/linux/scripts/installers/azpowershell.sh
@@ -12,7 +12,8 @@ source $HELPER_SCRIPTS/os.sh
 if isUbuntu20 ; then
     versions=$(pwsh -Command '(Find-Module -Name Az).Version')
 else
-    versions=(1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0)
+    toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json"
+    versions=$(cat $toolsetJson | jq -r '.azureModules[] | select(.name | contains("Az")) | .versions[]')
 fi
 
 # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
diff --git a/images/linux/toolset-1604.json b/images/linux/toolset-1604.json
index 4cbe78d4f..61092f794 100644
--- a/images/linux/toolset-1604.json
+++ b/images/linux/toolset-1604.json
@@ -59,5 +59,21 @@
                 "1.72.0"
             ]
         }
+    ],
+    "azureModules": [
+        {
+            "name": "Az",
+            "versions": [
+                "1.0.0",
+                "1.6.0",
+                "2.3.2",
+                "2.6.0",
+                "2.8.0",
+                "3.1.0",
+                "3.5.0",
+                "3.8.0",
+                "4.3.0"
+            ]
+        }
     ]
 }
\ No newline at end of file
diff --git a/images/linux/toolset-1804.json b/images/linux/toolset-1804.json
index ea910cdee..02bf093e3 100644
--- a/images/linux/toolset-1804.json
+++ b/images/linux/toolset-1804.json
@@ -59,5 +59,21 @@
                 "1.72.0"
             ]
         }
+    ],
+    "azureModules": [
+        {
+            "name": "Az",
+            "versions": [
+                "1.0.0",
+                "1.6.0",
+                "2.3.2",
+                "2.6.0",
+                "2.8.0",
+                "3.1.0",
+                "3.5.0",
+                "3.8.0",
+                "4.3.0"
+            ]
+        }
     ]
 }
\ No newline at end of file

From 7a2c4871fc0deb37ce9db7fd7bc827bb3ccc44ad Mon Sep 17 00:00:00 2001
From: Maksim Petrov <v-mapetr@microsoft.com>
Date: Sun, 28 Jun 2020 21:08:18 +0300
Subject: [PATCH 3/3] Small fix in syntax

---
 images/linux/scripts/installers/azpowershell.sh | 2 +-
 images/linux/toolset-1604.json                  | 2 +-
 images/linux/toolset-1804.json                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/linux/scripts/installers/azpowershell.sh b/images/linux/scripts/installers/azpowershell.sh
index 6cd4e2211..082ab185d 100644
--- a/images/linux/scripts/installers/azpowershell.sh
+++ b/images/linux/scripts/installers/azpowershell.sh
@@ -13,7 +13,7 @@ if isUbuntu20 ; then
     versions=$(pwsh -Command '(Find-Module -Name Az).Version')
 else
     toolsetJson="$INSTALLER_SCRIPT_FOLDER/toolset.json"
-    versions=$(cat $toolsetJson | jq -r '.azureModules[] | select(.name | contains("Az")) | .versions[]')
+    versions=$(cat $toolsetJson | jq -r '.azureModules[] | select(.name | contains("az")) | .versions[]')
 fi
 
 # Install Azure CLI (instructions taken from https://docs.microsoft.com/en-us/cli/azure/install-azure-cli)
diff --git a/images/linux/toolset-1604.json b/images/linux/toolset-1604.json
index 61092f794..c7d127531 100644
--- a/images/linux/toolset-1604.json
+++ b/images/linux/toolset-1604.json
@@ -62,7 +62,7 @@
     ],
     "azureModules": [
         {
-            "name": "Az",
+            "name": "az",
             "versions": [
                 "1.0.0",
                 "1.6.0",
diff --git a/images/linux/toolset-1804.json b/images/linux/toolset-1804.json
index 02bf093e3..8f6d5cc1e 100644
--- a/images/linux/toolset-1804.json
+++ b/images/linux/toolset-1804.json
@@ -62,7 +62,7 @@
     ],
     "azureModules": [
         {
-            "name": "Az",
+            "name": "az",
             "versions": [
                 "1.0.0",
                 "1.6.0",