From 12190efd410002a75b28167526273b9276d36bd2 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 19 Oct 2021 16:22:07 +0200
Subject: [PATCH] Everything works, actually!

---
 script/dev-cluster.sh |  2 +-
 script/test-smoke.sh  | 11 ++++++-----
 src/garage/main.rs    |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh
index d56fa6e3..81d22083 100755
--- a/script/dev-cluster.sh
+++ b/script/dev-cluster.sh
@@ -67,7 +67,7 @@ fi
 done
 # >>>>>>>>>>>>>>>> END FOR LOOP ON NODES
 
-sleep 5
+sleep 3
 # Establish connections between nodes
 for count in $(seq 1 3); do
 	NODE=$(garage -c /tmp/config.$count.toml node-id -q)
diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index ce9c032a..86bbe3ee 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -17,6 +17,7 @@ SKIP_DUCK=1
 echo "⏳ Setup"
 ${SCRIPT_FOLDER}/dev-clean.sh
 ${SCRIPT_FOLDER}/dev-cluster.sh > /tmp/garage.log 2>&1 &
+sleep 6
 ${SCRIPT_FOLDER}/dev-configure.sh
 ${SCRIPT_FOLDER}/dev-bucket.sh
 
@@ -116,9 +117,9 @@ if [ -z "$SKIP_AWS" ]; then
   echo "<h1>hello world</h1>" > /tmp/garage-index.html
   aws s3 cp /tmp/garage-index.html s3://eprouvette/index.html
   [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
-  garage bucket website --allow eprouvette
+  garage -c /tmp/config.1.toml bucket website --allow eprouvette
   [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 200 ]
-  garage bucket website --deny eprouvette
+  garage -c /tmp/config.1.toml bucket website --deny eprouvette
   [ `curl -s -o /dev/null -w "%{http_code}" --header "Host: eprouvette.garage.tld"  http://127.0.0.1:3923/ ` == 404 ]
   aws s3 rm s3://eprouvette/index.html
   rm /tmp/garage-index.html
@@ -127,8 +128,8 @@ fi
 echo "🏁 Teardown"
 AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1`
 AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2`
-garage bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID
-garage bucket delete --yes eprouvette
-garage key delete --yes $AWS_ACCESS_KEY_ID
+garage -c /tmp/config.1.toml bucket deny --read --write eprouvette --key $AWS_ACCESS_KEY_ID
+garage -c /tmp/config.1.toml bucket delete --yes eprouvette
+garage -c /tmp/config.1.toml key delete --yes $AWS_ACCESS_KEY_ID
 
 echo "✅ Success"
diff --git a/src/garage/main.rs b/src/garage/main.rs
index f7ef19cd..c4f75348 100644
--- a/src/garage/main.rs
+++ b/src/garage/main.rs
@@ -67,6 +67,7 @@ async fn main() {
 
 	if let Err(e) = res {
 		error!("{}", e);
+		std::process::exit(1);
 	}
 }