From 126c302e7ab88c7960230ba8ffc6c0f8722b4320 Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Mon, 11 Dec 2023 22:26:33 +0100
Subject: [PATCH] [macOS] Temporary pin the AzCopy version (#8979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update Software Report to support azcopy output

* [macOS] Temporary pin the AzCopy version

---------

Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”>
---
 images/macos/scripts/build/install-azcopy.sh             | 3 ++-
 images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/images/macos/scripts/build/install-azcopy.sh b/images/macos/scripts/build/install-azcopy.sh
index 0cd670c0743a..1ef682505330 100644
--- a/images/macos/scripts/build/install-azcopy.sh
+++ b/images/macos/scripts/build/install-azcopy.sh
@@ -11,7 +11,8 @@ arch=$(get_arch)
 if [ "$arch" == "arm64" ]; then
     brew_smart_install azcopy
 else
-    archive_path=$(download_with_retry "https://aka.ms/downloadazcopy-v10-mac")
+    # 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"
diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
index b61a869b53e4..41d4b9f74918 100644
--- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
+++ b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
@@ -348,7 +348,7 @@ function Get-Aria2Version {
 }
 
 function Get-AzcopyVersion {
-    $azcopyVersion = Run-Command "azcopy --version" | Take-Part -Part 2
+    $azcopyVersion = [string]$(Run-Command "azcopy --version") | Take-Part -Part 2
     return $azcopyVersion
 }