Support installing jq

Author: sterliakov

README.md

@@ -44,7 +44,9 @@ module "ecr_repo_image" {
 
 ## NOTES
 
-* This module needs `curl` and `jq` on `PATH`.
+* This module only works under Linux.
+* This module needs `curl` and `jq` on `PATH`. If `jq` are missing, it will fetch
+  and install `jq 1.7.1` locally for the appropriate architecture.
 
 ## EXAMPLES
 

scripts/helpers.sh

@@ -1,4 +1,5 @@
 #! /usr/bin/env bash
+set -eu
 
 curl_with_auth_header() {
   auth_params=()
@@ -43,3 +44,13 @@ check_vars() {
   fi
   return 0
 }
+
+install_jq() {
+  cd "${1:?Install directory not passed as $1 to install_jq}"
+  arch=$(uname -m)
+  case $arch in
+    x86_64) arch="amd64" ;;
+  esac
+  curl -fsSLo jq "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-$arch"
+  chmod 0755 jq
+}

scripts/pull.sh

@@ -37,14 +37,14 @@ _fetch_manifest() {
     if [ "$image_hash" = "null" ]; then
       available=$(jq -r '. | map(.platform.architecture) | join(", ")' <<<"$manifests")
       printf "Architecture %s not found. Available options are: %s\n" "$IMAGE_ARCH" "$available" >&2
-      exit 2
+      exit 3
     else
       IMAGE_TAG="$image_hash" _fetch_manifest
     fi
   else
     echo "Unknown manifest format: " >&2
     echo "$curl_output" >&2
-    exit 1
+    exit 3
   fi
   echo '_fetch_manifest: complete' >&2
 }
@@ -72,7 +72,7 @@ download_image() {
   if [[ -z "$config_digest" || "$config_digest" == 'null' ]]; then
     echo 'download_image: failed to parse config_digest from manifest' >&2
     cat "$manifest_file_path" >&2
-    return 1
+    return 3
   fi
 
   config_file_path="$dir_path/config.json"

scripts/pull_then_push.sh

@@ -17,6 +17,14 @@ set -eu
 #     PUSH_REPO_NAME='my-repo' \
 #     PUSH_IMAGE_TAG='latest' \
 #     ./pull_then_push.sh
+#
+# Exit codes:
+# * 1 - Undefined input variable
+# * 2 - Missing tools
+# * 3 - Pull failures
+# * 4, 5 - Push failures
+# * Other codes - curl failures or unexpected error
+#
 ##
 
 _dir_path() {
@@ -40,6 +48,25 @@ if [ -z ${PUSH_CURL_AUTH_HEADER+x} ]; then
   exit 1
 fi
 
+# Check tools
+if ! command -v curl &>/dev/null; then
+  echo "curl not found" >&2
+  exit 2
+fi
+if ! command -v jq &>/dev/null; then
+  echo "jq not found, trying to install..." >&2
+  bin_dir="$PULL_DOWNLOAD_DIR_PATH/bin"
+  mkdir -p "$bin_dir"
+  bin_dir=$(readlink -f "$bin_dir")
+  if install_jq "$bin_dir"; then
+    export PATH="$bin_dir:$PATH"
+    echo "Installed $(jq --version)." >&2
+  else
+    echo "jq not found and could not be installed" >&2
+    exit 2
+  fi
+fi
+
 # Pull image
 export CURL_AUTH_HEADER="$PULL_CURL_AUTH_HEADER"
 manifest_path=$(

scripts/push.sh

@@ -24,13 +24,13 @@ check_vars REPO_URL IMAGE_TAG LAYER_PATHS CONFIG_PATH MANIFEST_PATH
 echo "$LAYER_PATHS" | while read -r layer_path ; do
   if [[ ! -f "$layer_path" ]]; then
     echo "No file exists at layer_path of '$layer_path'" >&2
-    exit 1
+    exit 4
   fi
 done
 
 if [[ ! -f "$CONFIG_PATH" ]]; then
   echo "No file exists at CONFIG_PATH='$CONFIG_PATH'" >&2
-  exit 1
+  exit 4
 fi
 
 
@@ -65,7 +65,7 @@ _initiate_upload() {
   )
   if [[ -z "$location" ]]; then
     echo '_initiate_upload: Failed to parse Location from curl_output' >&2
-    return 1
+    return 5
   fi
 
   echo '_initiate_upload: complete' >&2
@@ -95,7 +95,7 @@ _patch_layer() {
   )
   if [[ -z "$location" ]]; then
     echo '_patch_layer: Failed to parse location from curl_output' >&2
-    return 1
+    return 5
   fi
 
   echo '_patch_layer: complete' >&2