Merge branch 'master' into toote_s3_backend_sync

Author: toote

backends/cache_s3

@@ -40,13 +40,14 @@ s3_cmd() {
 s3_listobjects() {
   local prefix="$1"
 
-  aws_cmd=(aws s3api list-objects-v2 --bucket "${BUILDKITE_PLUGIN_S3_CACHE_BUCKET}" --prefix "$(build_key "${prefix}")" --max-items 1)
+  aws_cmd=(aws s3api list-objects-v2 --bucket "${BUILDKITE_PLUGIN_S3_CACHE_BUCKET}" --prefix "$(build_key "${prefix}")" --max-items 1 --query Contents)
 
   if [ -n "${BUILDKITE_PLUGIN_S3_CACHE_ENDPOINT}" ]; then
     aws_cmd+=(--endpoint-url "${BUILDKITE_PLUGIN_S3_CACHE_ENDPOINT}")
   fi
 
-  "${aws_cmd[@]}"
+  result=$("${aws_cmd[@]}")
+  [ "${result}" != 'null' ]
 }
 
 restore_cache() {
@@ -70,7 +71,7 @@ save_cache() {
 
 exists_cache() {
   if [ -z "$1" ]; then exit 1; fi
-  [ -n "$(s3_listobjects "$1")" ]
+  s3_listobjects "$1"
 }
 
 OPCODE="$1"

tests/cache_s3.bats

@@ -37,7 +37,7 @@ setup() {
 }
 
 @test 'Exists on non-existing file fails' {
-  stub aws 'exit 1'
+  stub aws 'echo null'
 
   run "${PWD}/backends/cache_s3" exists PATH/THAT/DOES/NOT/EXIST
 
@@ -97,10 +97,10 @@ setup() {
   stub aws \
     's3 cp --recursive --endpoint-url https://s3.somewhere.com \* \* : echo ' \
     's3 cp --recursive --endpoint-url https://s3.somewhere.com \* \* : echo ' \
-    's3api list-objects-v2 --bucket \* --prefix \* --max-items 1 --endpoint-url https://s3.somewhere.com : echo exists' \
+    's3api list-objects-v2 --bucket \* --prefix \* --max-items 1 --query Contents --endpoint-url https://s3.somewhere.com : echo exists' \
     's3 cp --recursive \* \* : echo ' \
     's3 cp --recursive \* \* : echo ' \
-    's3api list-objects-v2 --bucket \* --prefix \* --max-items 1 : echo exists'
+    's3api list-objects-v2 --bucket \* --prefix \* --max-items 1 --query Contents : echo exists'
 
   run "${PWD}/backends/cache_s3" save from to
 
@@ -141,7 +141,7 @@ setup() {
   touch "${BATS_TEST_TMPDIR}/new-file"
   mkdir "${BATS_TEST_TMPDIR}/s3-cache"
   stub aws \
-    "echo" \
+    "echo null" \
     "ln -s \$4 $BATS_TEST_TMPDIR/s3-cache/\$(echo \$5 | md5sum | cut -c-32)" \
     "echo 'exists'" \
     "cp -r $BATS_TEST_TMPDIR/s3-cache/\$(echo \$4 | md5sum | cut -c-32) \$5"
@@ -179,7 +179,7 @@ setup() {
   echo 'random content' > "${BATS_TEST_TMPDIR}/new-folder/new-file"
 
   stub aws \
-    "echo" \
+    "echo null" \
     "ln -s \$4 $BATS_TEST_TMPDIR/s3-cache/\$(echo \$5 | md5sum | cut -c-32)" \
     "echo 'exists'" \
     "cp -r $BATS_TEST_TMPDIR/s3-cache/\$(echo \$4 | md5sum | cut -c-32) \$5"