From 132c54b8077422b611d6cf130592f32194ab53cd Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sat, 5 Dec 2020 18:27:51 +0100
Subject: wip smoke test

---
 script/dev-env.sh    | 16 ++++++----------
 script/test-smoke.sh |  5 +++--
 2 files changed, 9 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 script/dev-env.sh

(limited to 'script')

diff --git a/script/dev-env.sh b/script/dev-env.sh
old mode 100755
new mode 100644
index 88d2941f..4c52568a
--- 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"
-- 
cgit v1.2.3


From 28055b708fd27ed7407193eacdd5294b1192b067 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sun, 6 Dec 2020 09:13:47 +0100
Subject: Improve README, add more tests

---
 script/dev-env.sh    |  1 -
 script/test-smoke.sh | 14 +++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'script')

diff --git a/script/dev-env.sh b/script/dev-env.sh
index 4c52568a..15f08e2e 100644
--- a/script/dev-env.sh
+++ b/script/dev-env.sh
@@ -11,5 +11,4 @@ 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 800836b0..eaf1556b 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -13,11 +13,15 @@ ${SCRIPT_FOLDER}/dev-configure.sh
 ${SCRIPT_FOLDER}/dev-bucket.sh
 source ${SCRIPT_FOLDER}/dev-env.sh
 
-dd if=/dev/urandom of=/tmp/garage.rnd bs=1M count=10
+dd if=/dev/urandom of=/tmp/garage.1.rnd bs=512k count=1
+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
 
-s3grg cp /tmp/garage.rnd s3://eprouvette/
-s3grg ls s3://eprouvette
-s3grg cp s3://eprouvette/garage.rnd /tmp/garage.dl
+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
+  diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
+done
 
-diff /tmp/garage.rnd /tmp/garage.dl
 echo "success"
-- 
cgit v1.2.3


From a12930075dd33c7c18d6ad1afa4000efe55d10d6 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sun, 6 Dec 2020 10:04:17 +0100
Subject: Test garage list & delete commands

---
 script/test-smoke.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'script')

diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index eaf1556b..3a84b992 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -13,6 +13,10 @@ ${SCRIPT_FOLDER}/dev-configure.sh
 ${SCRIPT_FOLDER}/dev-bucket.sh
 source ${SCRIPT_FOLDER}/dev-env.sh
 
+garage status
+garage key list
+garage bucket list
+
 dd if=/dev/urandom of=/tmp/garage.1.rnd bs=512k count=1
 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
@@ -22,6 +26,11 @@ for idx in $(seq 1 3); do
   s3grg ls s3://eprouvette
   s3grg cp s3://eprouvette/garage.$idx.rnd /tmp/garage.$idx.dl
   diff /tmp/garage.$idx.rnd /tmp/garage.$idx.dl
+	s3grg rm s3://eprouvette/garage.$idx.rnd
 done
 
+garage bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID
+garage bucket delete --yes eprouvette
+garage key delete --yes $AWS_ACCESS_KEY_ID
+
 echo "success"
-- 
cgit v1.2.3


From d2d1fc676d0fe5b6fe927e4b6f6d2c162581971d Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sun, 6 Dec 2020 10:19:01 +0100
Subject: Test awscli/s3cmd interactions

---
 script/dev-env-aws.sh   | 14 ++++++++++++++
 script/dev-env-s3cmd.sh | 19 +++++++++++++++++++
 script/dev-env.sh       | 14 --------------
 script/test-smoke.sh    | 26 +++++++++++++++++++++-----
 4 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 script/dev-env-aws.sh
 create mode 100644 script/dev-env-s3cmd.sh
 delete mode 100644 script/dev-env.sh

(limited to 'script')

diff --git a/script/dev-env-aws.sh b/script/dev-env-aws.sh
new file mode 100644
index 00000000..c9a57660
--- /dev/null
+++ b/script/dev-env-aws.sh
@@ -0,0 +1,14 @@
+#!/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"
+
+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 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/dev-env.sh b/script/dev-env.sh
deleted file mode 100644
index 15f08e2e..00000000
--- a/script/dev-env.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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"
-
-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 \
-  --endpoint-url http://127.0.0.1:3911"
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
-- 
cgit v1.2.3


From a92868504f611adb6966a89602a72ae022222116 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sun, 6 Dec 2020 10:23:14 +0100
Subject: Indentation & comments

---
 script/test-smoke.sh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'script')

diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index 8a30429d..9b1ca977 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -23,25 +23,35 @@ 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
+  # AWS sends	
   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
-	rm /tmp/garage.$idx.dl
-	s3grg get s3://eprouvette/garage.$idx.aws /tmp/garage.$idx.dl
+  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
+  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
+  # S3CMD sends
+  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
+  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
+  rm /tmp/garage.$idx.dl
+	
+  s3grg rm s3://eprouvette/garage.$idx.s3cmd
 done
 rm /tmp/garage.{1,2,3}.rnd
 
-- 
cgit v1.2.3


From e13fd0954395836cd99e7deaeca7d0b7050802ee Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Sun, 6 Dec 2020 13:33:08 +0100
Subject: Reduce garage.1.rnd size to store it inline

---
 script/test-smoke.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'script')

diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index 9b1ca977..111afac9 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -18,7 +18,7 @@ garage status
 garage key list
 garage bucket list
 
-dd if=/dev/urandom of=/tmp/garage.1.rnd bs=512k count=1
+dd if=/dev/urandom of=/tmp/garage.1.rnd bs=1k count=2 # < INLINE_THRESHOLD = 3072 bytes
 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
 
-- 
cgit v1.2.3