From e6a69f4bd115a0ff14cef9f1342afa3bd4a078e8 Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Thu, 14 Dec 2023 11:06:59 +0100
Subject: [PATCH] [macOS] Update AzCopy installer to install 10.21.2 version
 (#9003)

---
 images/macos/scripts/build/install-azcopy.sh | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/images/macos/scripts/build/install-azcopy.sh b/images/macos/scripts/build/install-azcopy.sh
index 1ef682505..e0e95d9d9 100644
--- a/images/macos/scripts/build/install-azcopy.sh
+++ b/images/macos/scripts/build/install-azcopy.sh
@@ -5,18 +5,21 @@
 ################################################################################
 
 source ~/utils/utils.sh
-arch=$(get_arch)
 
-# Check MacOS architecture and if ARM install using brew
-if [ "$arch" == "arm64" ]; then
-    brew_smart_install azcopy
+if is_Arm64; then
+    # latest is available by https://aka.ms/downloadazcopy-v10-mac-arm64
+    url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_arm64_10.21.2.zip"
 else
-    # Temporary pin 10.21.2 version of AzCopy until 10.22.0 is fixed
-    archive_path=$(download_with_retry "https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_amd64_10.21.2.zip")
-    unzip -qq "$archive_path" -d /tmp/azcopy
-    extract_path=$(echo /tmp/azcopy/azcopy*)
-    cp "$extract_path/azcopy" "/usr/local/bin/azcopy"
-    chmod +x "/usr/local/bin/azcopy"
+    # latest is available by https://aka.ms/downloadazcopy-v10-mac
+    url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_amd64_10.21.2.zip"
 fi
 
+# Install AzCopy
+archive_path=$(download_with_retry "${url}")
+unzip -qq "$archive_path" -d /tmp/azcopy
+extract_path=$(echo /tmp/azcopy/azcopy*)
+cp "$extract_path/azcopy" "/usr/local/bin/azcopy"
+chmod +x "/usr/local/bin/azcopy"
+
+
 invoke_tests "Common" "AzCopy"