add support for aws cli v2 and fix unit tests

Author: renkoh

hooks/lib/ecr-registry-provider.bash

@@ -1,5 +1,18 @@
 login() {
-  $(aws ecr get-login --no-include-email)
+  local aws_cli_version=$(aws --version 2>&1 | cut -d " " -f1 | cut -d "/" -f2)
+
+  if [[ $aws_cli_version =~ ^1 ]]; then
+    $(aws ecr get-login --no-include-email)
+  else
+    local account_id=$(aws sts get-caller-identity --query "Account" --output text)
+    local region=$(aws configure get region)
+    
+    aws ecr get-login-password \
+      --region "${region}" \
+      | docker login \
+      --username AWS \
+      --password-stdin "${account_id}".dkr.ecr."${region}".amazonaws.com
+  fi
 }
 
 get_registry_url() {

tests/ecr-registry-provider.bats

@@ -9,18 +9,20 @@ load "$PWD/hooks/lib/ecr-registry-provider.bash"
 
 pre_command_hook="$PWD/hooks/pre-command"
 
-@test "ECR: Applies lifecycle policy to existing repositories" {
+@test "ECR: Applies lifecycle policy to existing repositories with aws-cli v1" {
   export BUILDKITE_ORGANIZATION_SLUG="example-org"
   export BUILDKITE_PIPELINE_SLUG="example-pipeline"
   local expected_repository_name="build-cache/example-org/example-pipeline"
 
   stub aws \
+    "--version : echo 'aws-cli/1.22.58 Python/3.9.2 Linux/5.10.76-linuxkit botocore/1.24.3'" \
     "ecr get-login --no-include-email : echo docker login -u AWS -p 1234 https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].registryId : echo looked up repository" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryArn : echo arn:aws:ecr:ap-southeast-2:1234567891012:repository/${expected_repository_name}" \
     "ecr tag-resource * : echo tag existing resource" \
     "ecr put-lifecycle-policy * : echo put lifecycle policy" \
-    "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com"
+    "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com" 
+    
   stub docker \
     "login -u AWS -p 1234 https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com : echo logging in to docker" \
     "pull : echo pulled image"
@@ -45,19 +47,20 @@ pre_command_hook="$PWD/hooks/pre-command"
   unstub sha1sum
 }
 
-@test "ECR: Builds new images with tags" {
+@test "ECR: Builds new images with tags with aws-cli v1" {
   export BUILDKITE_ORGANIZATION_SLUG="example-org"
   export BUILDKITE_PIPELINE_SLUG="example-pipeline"
   local expected_repository_name="build-cache/example-org/example-pipeline"
   local repository_uri="1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com/${expected_repository_name}"
 
   stub aws \
+    "--version : echo 'aws-cli/1.22.58 Python/3.9.2 Linux/5.10.76-linuxkit botocore/1.24.3'" \
     "ecr get-login --no-include-email : echo docker login -u AWS -p 1234 https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].registryId : echo looked up repository" \
     "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryArn : echo arn:aws:ecr:ap-southeast-2:1234567891012:repository/${expected_repository_name}" \
     "ecr tag-resource * : echo tag existing resource" \
     "ecr put-lifecycle-policy * : echo put lifecycle policy" \
-    "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo ${repository_uri}"
+    "ecr describe-repositories --repository-names ${expected_repository_name} --output text --query repositories[0].repositoryUri : echo ${repository_uri}" 
   stub docker \
     "login -u AWS -p 1234 https://1234567891012.dkr.ecr.ap-southeast-2.amazonaws.com : echo logging in to docker" \
     "pull : echo not found && false" \