Merge pull request #1558 from buildkite/SUP-4563-windows-aws-cli-v2

AWS CLI v2 in Windows AMI

Author: scadu

.buildkite/pipeline.yaml

@@ -106,6 +106,8 @@ steps:
   - id: "test-windows-amd64"
     name: ":cloudformation: :windows: AMD64 Test"
     command:
+      - aws --version
+      - jq --version
       - git --version
       - docker info
       - docker run --rm mcr.microsoft.com/windows/nanoserver:ltsc2022 cmd.exe /c echo hello
@@ -178,6 +180,8 @@ steps:
   - id: "test-linux-amd64"
     name: ":cloudformation: :linux: AMD64 Test"
     command:
+      - aws --version
+      - jq --version
       - git --version
       - sudo goss validate --format documentation
     timeout_in_minutes: 5
@@ -249,6 +253,8 @@ steps:
   - id: "test-linux-arm64"
     name: ":cloudformation: :linux: ARM64 Test"
     command:
+      - aws --version
+      - jq --version
       - git --version
       - sudo goss validate --format documentation
     retry: { automatic: { limit: 3 } }

packer/linux/scripts/install-utils.sh

@@ -2,6 +2,8 @@
 
 set -euo pipefail
 
+AWS_CLI_LINUX_VERSION=2.28.15
+
 case $(uname -m) in
 x86_64) ARCH=amd64 ;;
 aarch64) ARCH=arm64 ;;
@@ -15,7 +17,6 @@ echo Installing utils...
 sudo dnf install -yq \
   amazon-ssm-agent \
   aws-cfn-bootstrap \
-  awscli-2 \
   ec2-instance-connect \
   git \
   jq \
@@ -42,6 +43,24 @@ sudo dnf -yq groupinstall "Development Tools"
 sudo systemctl enable --now amazon-ssm-agent
 sudo systemctl enable --now rsyslog
 
+echo "Installing AWS CLI v2 ${AWS_CLI_LINUX_VERSION}..."
+pushd "$(mktemp -d)"
+case $(uname -m) in
+x86_64)
+  curl -sSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_LINUX_VERSION}.zip" -o "awscliv2.zip"
+  ;;
+aarch64)
+  curl -sSL "https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${AWS_CLI_LINUX_VERSION}.zip" -o "awscliv2.zip"
+  ;;
+*)
+  echo "Unsupported architecture for AWS CLI v2"
+  exit 1
+  ;;
+esac
+unzip -qq awscliv2.zip
+sudo ./aws/install
+popd
+
 GIT_LFS_VERSION=3.4.0
 echo "Installing git lfs ${GIT_LFS_VERSION}..."
 pushd "$(mktemp -d)"

packer/windows/scripts/install-utils.ps1

@@ -1,10 +1,8 @@
 # Stop script execution when a non-terminating error occurs
 $ErrorActionPreference = "Stop"
 
-# pinned because awscli v2 drops 'aws ecr get-login'
-# https://github.com/buildkite-plugins/ecr-buildkite-plugin/issues/37
-$AWS_CLI_VERSION = 1.18.11
-$GIT_VERSION = 2.39.1
+$AWS_CLI_WINDOWS_VERSION = "2.28.15"
+$GIT_VERSION = "2.39.1"
 
 Write-Output "Installing chocolatey package manager"
 Set-ExecutionPolicy Bypass -Scope Process -Force
@@ -14,8 +12,13 @@ Write-Output "Installing jq"
 choco install -y jq
 If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
-Write-Output "Installing awscli"
-choco install -y awscli --version=$AWS_CLI_VERSION
+Write-Output "Installing AWS CLI v2 $AWS_CLI_WINDOWS_VERSION..."
+$tempDir = New-TemporaryFile | %{ Remove-Item $_; New-Item -ItemType Directory -Path $_ }
+$msiPath = Join-Path $tempDir "AWSCLIV2.msi"
+$msiUrl = "https://awscli.amazonaws.com/AWSCLIV2-$AWS_CLI_WINDOWS_VERSION.msi"
+Invoke-WebRequest -Uri $msiUrl -OutFile $msiPath
+Start-Process -FilePath "msiexec.exe" -ArgumentList "/i `"$msiPath`" /quiet" -Wait
+Remove-Item -Recurse -Force $tempDir
 If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 Write-Output "Installing Git for Windows"
@@ -42,7 +45,7 @@ Update-SessionEnvironment
 Write-Output "Prepending 'gitinstall\mingw64\bin' and 'gitinstall\usr\bin' to the system's PATH"
 $oldpath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH).Path
 $newpath = "C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;$oldpath"
-Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value $newPath
+Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value $newpath
 
 # Set autocrlf to false so we don't end up with mismatched line endings
 git config --system core.autocrlf false