Support aws cli v1 (#37)

* Update Dockerfile, entrypoint.sh, and test workflows for compatibility with Ubuntu 24.04

- Upgrade base image in Dockerfile to Ubuntu 24.04 and install python3-venv.
- Modify entrypoint.sh to improve error handling and logging for AWS CLI installation.
- Create a new Makefile for build and run commands.
- Update GitHub Actions workflows to use Ubuntu 24.04 for all jobs.

* Update test.yaml to use actions/cache@main for Docker layer caching

- Changed the version of actions/cache from v2 to main in two places to ensure the latest features and fixes are utilized for caching Docker layers.

* Update AWS CLI version in test.yaml to 1.41.8 for improved compatibility

* Update error message in entrypoint.sh for AWS CLI v1 architecture support

* fixed support for v1

* Update Dockerfile to use Python 3.12-slim base image and remove python3-venv installation

Author: unfor19

.github/workflows/test.yaml

@@ -9,7 +9,7 @@ on:
 jobs:
   dispatch_test_action:
     name: Dispatch Test Action
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@main
       - name: Workflow Dispatch Status
@@ -24,7 +24,7 @@ jobs:
           gh_token: ${{ secrets.GH_TOKEN }} # scope: repo + workflow
 
   test_dirs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
@@ -61,7 +61,7 @@ jobs:
           sudo --preserve-env ./entrypoint.sh
 
   test_x86:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
@@ -72,7 +72,7 @@ jobs:
           - TEST_NAME: "Latest v1"
             AWS_CLI_VERSION: "1"
           - TEST_NAME: "Specific v1"
-            AWS_CLI_VERSION: "1.32.19"
+            AWS_CLI_VERSION: "1.41.8"
           - TEST_NAME: "No Input"
     name: Test amd64 ${{ matrix.TEST_NAME }} ${{ matrix.AWS_CLI_VERSION}}
     steps:
@@ -85,7 +85,7 @@ jobs:
           sudo --preserve-env ./entrypoint.sh
 
   test_x64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
@@ -96,7 +96,7 @@ jobs:
           - TEST_NAME: "Latest v1"
             AWS_CLI_VERSION: "1"
           - TEST_NAME: "Specific v1"
-            AWS_CLI_VERSION: "1.32.19"
+            AWS_CLI_VERSION: "1.41.8"
           - TEST_NAME: "No Input"
     name: Test amd64 ${{ matrix.TEST_NAME }} ${{ matrix.AWS_CLI_VERSION}}
     steps:
@@ -109,7 +109,7 @@ jobs:
           sudo --preserve-env ./entrypoint.sh
 
   test_amd64:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
@@ -120,7 +120,7 @@ jobs:
           - TEST_NAME: "Latest v1"
             AWS_CLI_VERSION: "1"
           - TEST_NAME: "Specific v1"
-            AWS_CLI_VERSION: "1.32.19"
+            AWS_CLI_VERSION: "1.41.8"
           - TEST_NAME: "No Input"
     name: Test amd64 ${{ matrix.TEST_NAME }} ${{ matrix.AWS_CLI_VERSION}}
     steps:
@@ -134,7 +134,7 @@ jobs:
 
   test_arm:
     # Supports only v2+
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
@@ -190,7 +190,7 @@ jobs:
 
   test_arm64:
     # Supports only v2+
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:

Dockerfile

@@ -1,5 +1,5 @@
-FROM ubuntu:20.04
-RUN apt-get update -y && apt-get install -y wget unzip python3
+FROM python:3.12-slim
+RUN apt-get update -y && apt-get install -y wget unzip
 WORKDIR /app/
 COPY . .
 ENTRYPOINT ["./entrypoint.sh"]

Makefile

@@ -0,0 +1,84 @@
+#!make
+.ONESHELL:
+.EXPORT_ALL_VARIABLES:
+.PHONY: all $(MAKECMDGOALS)
+
+UNAME := $(shell uname)
+UNAME_ARCH := $(shell uname -m)
+ROOT_DIR:=${CURDIR}
+BASH_PATH:=$(shell which bash)
+
+# --- OS Settings --- START ------------------------------------------------------------
+# Windows
+ifneq (,$(findstring NT, $(UNAME)))
+_OS:=windows
+endif
+# macOS
+ifneq (,$(findstring Darwin, $(UNAME)))
+_OS:=macos
+endif
+
+ifneq (,$(findstring Linux, $(UNAME)))
+_OS:=linux
+endif
+
+# Architecture
+ifneq (,$(findstring arm64, $(UNAME_ARCH)))
+_ARCH:=arm64
+endif
+
+ifneq (,$(findstring x86_64, $(UNAME_ARCH)))
+_ARCH:=amd64
+endif
+
+_AWS_CLI_VERSION:=v2
+_AWS_CLI_ARCH:=amd64
+
+ifndef AWS_CLI_VERSION
+AWS_CLI_VERSION:=${_AWS_CLI_VERSION}
+endif
+
+ifndef AWS_CLI_ARCH
+AWS_CLI_ARCH:=${_AWS_CLI_ARCH}
+endif
+
+
+ifndef ARCH
+ARCH:=${_ARCH}
+endif
+
+
+# --- OS Settings --- END --------------------------------------------------------------
+
+SHELL:=${BASH_PATH}
+
+DOCKER_IMAGE_NAME:=install-aws-cli-action
+
+# Removes blank rows - fgrep -v fgrep
+# Replace ":" with "" (nothing)
+# Print a beautiful table with column
+help: ## Print this menu
+	@echo
+	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's~:.* #~~' | column -t -s'#'
+	@echo
+usage: help
+
+
+# To validate env vars, add "validate-MY_ENV_VAR"
+# as a prerequisite to the relevant target/step
+validate-%:
+	@if [[ -z '${${*}}' ]]; then \
+		echo 'ERROR: Environment variable $* not set' && \
+		exit 1 ; \
+	fi
+
+
+docker-build:
+	docker build --platform linux/${ARCH} -t ${DOCKER_IMAGE_NAME} .
+
+build: docker-build
+
+docker-run:
+	docker run --rm --platform linux/${ARCH} -it ${DOCKER_IMAGE_NAME} "${AWS_CLI_VERSION}" "${AWS_CLI_ARCH}"
+
+run: docker-run

entrypoint.sh

@@ -61,7 +61,10 @@ get_download_url(){
     provided_arch="$2"
     # v1
     if [[ "$provided_version" =~ ^1.*$ ]]; then
-        [[ "$provided_arch" != "amd64" ]] && msg_error "AWS CLI v1 does not support ${_AWS_CLI_VERSION}"
+        if [[ "$provided_arch" =~ ^(arm.*|aarch64)$ ]]; then
+            echo "Provided arch ${provided_arch} is not supported for AWS CLI v1"
+            return
+        fi
         if [[ "$provided_version" = "1" ]]; then
             download_url="https://s3.amazonaws.com/aws-cli/awscli-bundle.zip"
         else
@@ -90,6 +93,7 @@ get_download_url(){
 }
 
 set_download_tool(){
+    msg_log "Setting download tool"
     # Default is "wget", fallback is "curl", fails otherwise
     if which wget 1>/dev/null; then
         _AWS_CLI_DOWNLOAD_TOOL="wget"
@@ -98,6 +102,7 @@ set_download_tool(){
     else
         msg_error "Both 'wget' and 'curl' are not installed"
     fi
+    msg_log "Download tool set to ${_AWS_CLI_DOWNLOAD_TOOL}"
 }
 
 
@@ -155,7 +160,7 @@ install_aws_cli(){
     wait
     msg_log "Installing AWS CLI - ${provided_version}"
     if [[ "$provided_version" =~ ^1.*$ ]]; then
-        ./awscli-bundle/install -i "${_INSTALLROOTDIR}}/aws" -b "${_BINDIR}/aws"
+        ./awscli-bundle/install -i "${_INSTALLROOTDIR}/aws" -b "${_BINDIR}/aws"
     elif [[ "$provided_version" =~ ^2.*$ ]]; then
         local aws_path=""
         aws_path=$(which aws || true)
@@ -264,6 +269,7 @@ set_download_tool
 
 # Set Download URL and check if file exists on server
 _AWS_CLI_DOWNLOAD_URL="${AWS_CLI_DOWNLOAD_URL:-"$(get_download_url "$_AWS_CLI_VERSION" "$_AWS_CLI_ARCH" 2>&1)"}"
+
 [[ ! "$_AWS_CLI_DOWNLOAD_URL" =~ ^https://.* ]] && msg_error "$_AWS_CLI_DOWNLOAD_URL"
 check_version_exists "$_AWS_CLI_DOWNLOAD_URL"