Test awscli/s3cmd interactions

4 files changed, 43 insertions, 8 deletions

diff --git a/README.md b/README.md
index 1f5a56b1..8a6363ff 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,9 @@ We propose the following quickstart to setup a full dev. environment as quickly
   4. Run `./script/dev-cluster.sh` to launch a test cluster (feel free to read the script)
   5. Run `./script/dev-configure.sh` to configure your test cluster with default values (same datacenter, 100 tokens)
   6. Run `./script/dev-bucket.sh` to create a bucket named `eprouvette` and an API key that will be stored in `/tmp/garage.s3`
-  7. Run `source ./script/dev-env.sh` to configure your CLI environment
+  7. Run `source ./script/dev-env-aws.sh` to configure your CLI environment
   8. You can use `garage` to manage the cluster. Try `garage --help`.
-  9. You can use the `s3grg` alias to add, remove, and delete files. Try `s3grg help`, `s3grg cp /proc/cpuinfo s3://eprouvette/cpuinfo.txt`, or `s3grg ls s3://eprouvette`. `s3grg` is a wrapper on the `aws s3` command pre-configured with the previously generated API key (the one in `/tmp/garage.s3`) and localhost as the endpoint.
+  9. You can use the `awsgrg` alias to add, remove, and delete files. Try `awsgrg help`, `awsgrg cp /proc/cpuinfo s3://eprouvette/cpuinfo.txt`, or `awsgrg ls s3://eprouvette`. `awsgrg` is a wrapper on the `aws s3` command pre-configured with the previously generated API key (the one in `/tmp/garage.s3`) and localhost as the endpoint.
 
 Now you should be ready to start hacking on garage!
 
diff --git a/script/dev-env.sh b/script/dev-env-aws.sh
index 15f08e2e..c9a57660 100644
--- a/script/dev-env.sh
+++ b/script/dev-env-aws.sh
@@ -10,5 +10,5 @@ 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 \
+alias awsgrg="aws s3 \
   --endpoint-url http://127.0.0.1:3911"
diff --git a/script/dev-env-s3cmd.sh b/script/dev-env-s3cmd.sh
new file mode 100644
index 00000000..88d2941f
--- /dev/null
+++ b/script/dev-env-s3cmd.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+SCRIPT_FOLDER="`dirname \"${BASH_SOURCE[0]}\"`"
+REPO_FOLDER="${SCRIPT_FOLDER}/../"
+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"
+
diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index 3a84b992..8a30429d 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -11,7 +11,8 @@ ${SCRIPT_FOLDER}/dev-clean.sh
 ${SCRIPT_FOLDER}/dev-cluster.sh > /tmp/garage.log 2>&1 &
 ${SCRIPT_FOLDER}/dev-configure.sh
 ${SCRIPT_FOLDER}/dev-bucket.sh
-source ${SCRIPT_FOLDER}/dev-env.sh
+source ${SCRIPT_FOLDER}/dev-env-aws.sh
+source ${SCRIPT_FOLDER}/dev-env-s3cmd.sh
 
 garage status
 garage key list
@@ -22,12 +23,27 @@ dd if=/dev/urandom of=/tmp/garage.2.rnd bs=1M count=5
 dd if=/dev/urandom of=/tmp/garage.3.rnd bs=1M count=10
 
 for idx in $(seq 1 3); do
-  s3grg cp /tmp/garage.$idx.rnd s3://eprouvette/
-  s3grg ls s3://eprouvette
-  s3grg cp s3://eprouvette/garage.$idx.rnd /tmp/garage.$idx.dl
+  awsgrg cp /tmp/garage.$idx.rnd s3://eprouvette/garage.$idx.aws
+  awsgrg ls s3://eprouvette
+  awsgrg cp s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl
   diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
-	s3grg rm s3://eprouvette/garage.$idx.rnd
+	rm /tmp/garage.$idx.dl
+	s3grg get s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl
+  diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
+	rm /tmp/garage.$idx.dl
+  awsgrg rm s3://eprouvette/garage.$idx.aws
+
+	s3grg put /tmp/garage.$idx.rnd s3://eprouvette/garage.$idx.s3cmd
+	s3grg ls s3://eprouvette
+	s3grg get s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl
+  diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
+	rm /tmp/garage.$idx.dl
+  awsgrg cp s3://eprouvette/garage.$idx.s3cmd /tmp/garage.$idx.dl
+  diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
+	rm /tmp/garage.$idx.dl
+	s3grg rm s3://eprouvette/garage.$idx.s3cmd
 done
+rm /tmp/garage.{1,2,3}.rnd
 
 garage bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID
 garage bucket delete --yes eprouvette