Support more options with environment variables

Author: trnubo

commands/common.sh

@@ -76,14 +76,23 @@ parse_options() {
 
     # Pull in environment variables prefixed with TOOLBOX_
     # TOOLBOX_SKIP_DATABASES should be comma separated
-    for item in skip_databases; do
+    for item in skip_databases format compression umask; do
         local varname
         varname="TOOLBOX_${item^^}"
         if [[ -n "${!varname:-}" ]]; then
           eval ${item}="${!varname}"
         fi
     done
 
+    # Pull in *-args environment variables
+    for item in aws_args pgdump_args; do
+        local varname
+        varname="${item^^}"
+        if [[ -n "${!varname:-}" ]]; then
+          IFS=$' \n\t' eval read -r -a ${item} <<<"${!varname}"
+        fi
+    done
+
     # 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:,umask:,skip-globals,skip-database:,skip-analyze,full-count,aws-args:,pgdump-args:"

tests/save.bats

@@ -31,6 +31,7 @@ teardown_file() {
 		-e DATABASE_HOST=${postgres_container_ip} \
 		-e DATABASE_USERNAME=postgres \
 		-e DATABASE_PASSWORD=password \
+		-e TOOLBOX_COMRESSION=lz4 \
 		-v "${working_volume}:/db-dumps" \
 		"${TOOLBOX_IMAGE}" save --umask 022 --pgdump-args "--compress 0" --format custom /db-dumps
 	diag "${output}"
@@ -42,9 +43,10 @@ teardown_file() {
 		-e DATABASE_HOST=${postgres_container_ip} \
 		-e DATABASE_USERNAME=postgres \
 		-e DATABASE_PASSWORD=password \
+		-e AWS_ARGS="--endpoint-url http://${minio_container_ip}:9000" \
 		-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
+		"${TOOLBOX_IMAGE}" save --format custom --compression lz4 s3://db-dumps
 	diag "${output}"
 	[[ "${status}" -eq 0 ]]
 }