remove redundant session token

This commit is contained in:
Girish Ramakrishnan
2016-04-03 23:23:23 -07:00
parent 16a65fb185
commit d839f0b762
8 changed files with 11 additions and 22 deletions

View File

@@ -13,7 +13,7 @@ if [[ $# == 1 && "$1" == "--check" ]]; then
fi
if [ $# -lt 4 ]; then
echo "Usage: backupapp.sh <appid> <url> <url> <key> [aws session token]"
echo "Usage: backupapp.sh <appid> <url> <url> <key>"
exit 1
fi
@@ -23,7 +23,6 @@ app_id="$1"
backup_url="$2"
backup_config_url="$3"
backup_key="$4"
session_token="$5" # unused since it seems to be part of the url query param in v4 signature
readonly now=$(date "+%Y-%m-%dT%H:%M:%S")
readonly app_data_dir="${DATA_DIR}/${app_id}"
readonly app_data_snapshot="${DATA_DIR}/snapshots/${app_id}-${now}"

View File

@@ -13,13 +13,12 @@ if [[ $# == 1 && "$1" == "--check" ]]; then
fi
if [ $# -lt 2 ]; then
echo "Usage: backupbox.sh <url> <key> [aws session token]"
echo "Usage: backupbox.sh <url> <key>"
exit 1
fi
backup_url="$1"
backup_key="$2"
session_token="$3"
now=$(date "+%Y-%m-%dT%H:%M:%S")
BOX_DATA_DIR="${HOME}/data/box"
box_snapshot_dir="${HOME}/data/snapshots/box-${now}"
@@ -36,11 +35,6 @@ for try in `seq 1 5`; do
headers=("-H" "Content-Type:")
# federated tokens in CaaS case need session token
if [ ! -z "$session_token" ]; then
headers=(${headers[@]} "-H" "x-amz-security-token: ${session_token}")
fi
if tar -cvzf - -C "${box_snapshot_dir}" . \
| openssl aes-256-cbc -e -pass "pass:${backup_key}" \
| curl --fail -X PUT ${headers[@]} --data-binary @- "${backup_url}" 2>"${error_log}"; then