aboutsummaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
Diffstat (limited to 'script')
-rw-r--r--[-rwxr-xr-x]script/dev-env.sh16
-rwxr-xr-xscript/test-smoke.sh5
2 files changed, 9 insertions, 12 deletions
diff --git a/script/dev-env.sh b/script/dev-env.sh
index 88d2941f..4c52568a 100755..100644
--- a/script/dev-env.sh
+++ b/script/dev-env.sh
@@ -6,14 +6,10 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH"
-ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f1`
-SECRET_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
-
-alias s3grg="s3cmd \
- --host 127.0.0.1:3911 \
- --host-bucket 127.0.0.1:3911 \
- --access_key=$ACCESS_KEY \
- --secret_key=$SECRET_KEY \
- --region=garage \
- --no-ssl"
+export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
+export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
+export AWS_DEFAULT_REGION='garage'
+alias s3grg="aws s3 \
+ --debug \
+ --endpoint-url http://127.0.0.1:3911"
diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index 7b462b00..800836b0 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -15,8 +15,9 @@ source ${SCRIPT_FOLDER}/dev-env.sh
dd if=/dev/urandom of=/tmp/garage.rnd bs=1M count=10
-s3grg put /tmp/garage.rnd s3://eprouvette/
+s3grg cp /tmp/garage.rnd s3://eprouvette/
s3grg ls s3://eprouvette
-s3grg get s3://eprouvette/garage.rnd /tmp/garage.dl
+s3grg cp s3://eprouvette/garage.rnd /tmp/garage.dl
diff /tmp/garage.rnd /tmp/garage.dl
+echo "success"