diff --git a/src/test/bash/install_vault.sh b/src/test/bash/install_vault.sh index 9c762671..c9c34ac3 100755 --- a/src/test/bash/install_vault.sh +++ b/src/test/bash/install_vault.sh @@ -8,12 +8,13 @@ set -o errexit EDITION="${EDITION:-oss}" -VAULT_OSS="${VAULT_OSS:-1.3.4}" +VAULT_OSS="${VAULT_OSS:-1.3.1}" VAULT_ENT="${VAULT_ENT:-0.11.0}" UNAME=$(uname -s | tr '[:upper:]' '[:lower:]') VERBOSE=false VAULT_DIRECTORY=vault DOWNLOAD_DIRECTORY=download +PLATFORM=amd64 readonly script_name="$(basename "${BASH_SOURCE[0]}")" function say() { @@ -104,12 +105,12 @@ function download() { # install Vault say "Downloading Vault from ${VAULT_URL}" - verbose "curl ${VAULT_URL} --output ${VAULT_FILE}" + verbose "wget ${VAULT_URL} -O ${VAULT_FILE}" if [[ ${VERBOSE} == true ]]; then - curl "${VAULT_URL}" -vs --output "${VAULT_FILE}" + wget "${VAULT_URL}" -O "${VAULT_FILE}" else - curl "${VAULT_URL}" -s --output "${VAULT_FILE}" + wget "${VAULT_URL}" -q -O "${VAULT_FILE}" fi if [[ $? != 0 ]]; then @@ -123,7 +124,7 @@ function download() { function download_oss() { VAULT_VER="${VAULT_VER:-${VAULT_OSS}}" - VAULT_ZIP="vault_${VAULT_VER}_${UNAME}_amd64.zip" + VAULT_ZIP="vault_${VAULT_VER}_${UNAME}_${PLATFORM}.zip" VAULT_FILE=${VAULT_ZIP} VAULT_URL="https://releases.hashicorp.com/vault/${VAULT_VER}/${VAULT_ZIP}" @@ -134,8 +135,8 @@ function download_oss() { function download_enterprise() { VAULT_VER="${VAULT_VER:-${VAULT_ENT}}" - VAULT_ZIP="vault-enterprise_${VAULT_VER}%2Bent_${UNAME}_amd64.zip" - VAULT_FILE="vault-enterprise_${VAULT_VER}+ent_${UNAME}_amd64.zip" + VAULT_ZIP="vault-enterprise_${VAULT_VER}%2Bent_${UNAME}_${PLATFORM}.zip" + VAULT_FILE="vault-enterprise_${VAULT_VER}+ent_${UNAME}_${PLATFORM}.zip" VAULT_URL="http://hc-enterprise-binaries.s3.amazonaws.com/vault/ent/${VAULT_VER}/${VAULT_ZIP}" download @@ -146,7 +147,9 @@ function main() { initialize parse_options "$@" - + if [ "$(uname -m)" == aarch64 ]; then + PLATFORM=arm64 + fi if [[ ${EDITION} == 'oss' ]]; then download_oss elif [[ ${EDITION} == 'enterprise' ]]; then