Fix umask and add minio save test

Author: trnubo

commands/common.sh

@@ -86,7 +86,7 @@ parse_options() {
 
     # Options and long options
     local options="h:p:U:d:W:"
-    local longopts="host:,port:,username:,dbname:,password:,password-file:,no-create-database,no-revoke-public-create,drop-database,format:,compression:,skip-globals,skip-database:,skip-analyze,full-count"
+    local longopts="host:,port:,username:,dbname:,password:,password-file:,no-create-database,no-revoke-public-create,drop-database,format:,compression:,umask:,skip-globals,skip-database:,skip-analyze,full-count,aws-args:"
     local parsed
 
     # Parse with getopt (not getopts)
@@ -138,6 +138,10 @@ parse_options() {
           format="${2}"
           shift 2
           ;;
+        --umask)
+          umask="${2}"
+          shift 2
+          ;;
         --compression)
           compression="${2}"
           shift 2
@@ -154,6 +158,10 @@ parse_options() {
           full_count="true"
           shift
           ;;
+        --aws-args)
+          IFS=$' \n\t' read -r -a aws_args <<<"${2}"
+          shift 2
+          ;;
         --)
           shift
           break

commands/save

@@ -28,6 +28,7 @@ usage() {
     echoerr ""
     echoerr "Options:"
     echoerr "    --pgdump-args    NOT IMPLEMENTED"
+    echoerr "    --aws-args    OPTIONS"
     echoerr "    --format    plain|custom"
     echoerr "    --compression    gzip|lz4|bz2|none"
     echoerr "    --date-format    %Y%m%d%H%M%S"
@@ -61,7 +62,7 @@ case "${dest}" in
         ;;
     s3://*)
         echo ">> aws s3"
-        save_cmd=( "aws" "s3" "sync" "--no-progress" )
+        save_cmd=( "aws" "${aws_args[@]}" "s3" "sync" "--no-progress" )
         dest_type="s3"
         ;;
     file://*|/*|./*)
@@ -195,6 +196,7 @@ if [[ "${dest_type}" == "file" ]]; then
     ls -l "${full_path}"
 else
     echo ">> Uploading to ${full_path}"
+    echoerr "${save_cmd[@]}" "${save_path}" "${full_path}"
     "${save_cmd[@]}" "${save_path}" "${full_path}"
 
     # Clean up the save path if successful and not a file type save

tests/minio_setup.bash

@@ -0,0 +1,14 @@
+setup() {
+	minio_container="$(docker run -d \
+		-e MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE \
+		-e MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY \
+		-p "9000:9000" \
+		-v $(DATA_DIR)/minio:/export \
+		--entrypoint /bin/sh minio/minio:latest -c "mkdir -p /export/db-dumps && /usr/bin/minio server /export")"
+	minio_container_ip="$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${minio_container})"
+}
+
+teardown() {
+	# teardown runs after each test
+	docker rm -f "${minio_container}"
+}

tests/save.bats

@@ -1,4 +1,5 @@
 load test_functions.bash
+load minio_setup.bash
 
 setup_file() {
 	export postgres_container="$(docker run -d -e POSTGRES_PASSWORD=password postgres:${POSTGRES_TARGET_VERSION})"
@@ -31,7 +32,19 @@ teardown_file() {
 		-e DATABASE_USERNAME=postgres \
 		-e DATABASE_PASSWORD=password \
 		-v "${working_volume}:/db-dumps" \
-		"${TOOLBOX_IMAGE}" save /db-dumps
+		"${TOOLBOX_IMAGE}" save --umask 022 /db-dumps
+	diag "${output}"
+	[[ "${status}" -eq 0 ]]
+}
+
+@test "save to minio/s3" {
+	run docker run --rm \
+		-e DATABASE_HOST=${postgres_container_ip} \
+		-e DATABASE_USERNAME=postgres \
+		-e DATABASE_PASSWORD=password \
+		-e AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMPLE \
+		-e AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY \
+		"${TOOLBOX_IMAGE}" save --aws-args "--endpoint-url http://${minio_container_ip}:9000" --format custom --compression lz4 s3://db-dumps
 	diag "${output}"
 	[[ "${status}" -eq 0 ]]
 }