From 286fb24a6328f1956eadbdadc6c08c505a2fc2fd Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Fri, 10 Nov 2023 11:22:42 +0100
Subject: [PATCH] [macOS] Add AWS cli to the macOS 13 arm64 (#8774)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”>
---
 images/macos/software-report/SoftwareReport.Generator.ps1 | 8 +++-----
 images/macos/templates/macOS-13.arm64.anka.pkr.hcl        | 1 +
 images/macos/tests/Common.Tests.ps1                       | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index ff694767..d58a2769 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -160,11 +160,9 @@ if ($os.IsBigSur) {
 if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64) -and (-not $os.IsSonoma)) {
     $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion))
 }
-if (-not $os.IsVenturaArm64) {
-    $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion))
-    $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion))
-    $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion))
-}
+$tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion))
+$tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion))
+$tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion))
 $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion))
 $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion))
 $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion))
diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
index 05434398..4e273277 100644
--- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
+++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
@@ -198,6 +198,7 @@ build {
       "./provision/core/action-archive-cache.sh",
       "./provision/core/llvm.sh",
       "./provision/core/openjdk.sh",
+      "./provision/core/aws.sh",
       "./provision/core/rust.sh",
       "./provision/core/gcc.sh",
       "./provision/core/cocoapods.sh",
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index f0d4f830..8fa92dd0 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -39,7 +39,7 @@ Describe "vcpkg" -Skip:($os.IsVenturaArm64) {
     }
 }
 
-Describe "AWS" -Skip:($os.IsVenturaArm64) {
+Describe "AWS" {
     It "AWS CLI" {
         "aws --version" | Should -ReturnZeroExitCode
     }