fix: S3 retention and JSON formatting issues in logical-backup dump script

Author: mikolajsobolewski

logical-backup/dump.sh

@@ -58,7 +58,19 @@ function aws_delete_objects {
     [[ ! -z "$LOGICAL_BACKUP_S3_ENDPOINT" ]] && args+=("--endpoint-url=$LOGICAL_BACKUP_S3_ENDPOINT")
     [[ ! -z "$LOGICAL_BACKUP_S3_REGION" ]] && args+=("--region=$LOGICAL_BACKUP_S3_REGION")
 
-    aws s3api delete-objects "${args[@]}" --delete Objects=["$(printf {Key=%q}, "$@")"],Quiet=true
+    local objects_json="["
+    local first=true
+    for key in "$@"; do
+        if [ "$first" = true ]; then
+            first=false
+        else
+            objects_json+=","
+        fi
+        objects_json+="{\"Key\":\"$key\"}"
+    done
+    objects_json+="]"
+
+    aws s3api delete-objects "${args[@]}" --delete "Objects=$objects_json,Quiet=true"
 }
 export -f aws_delete_objects
 
@@ -85,10 +97,7 @@ function aws_delete_outdated {
     [[ ! -z "$LOGICAL_BACKUP_S3_REGION" ]] && args+=("--region=$LOGICAL_BACKUP_S3_REGION")
 
     # list objects older than the cutoff date
-    aws s3api list-objects "${args[@]}" --query="Contents[?LastModified<='$cutoff_date'].[Key]" > /tmp/outdated-backups
-
-    # spare the last backup
-    sed -i '$d' /tmp/outdated-backups
+    aws s3api list-objects "${args[@]}" --query="Contents[?LastModified!=null && LastModified<='$cutoff_date'].[Key]" > /tmp/outdated-backups
 
     count=$(wc -l < /tmp/outdated-backups)
     if [[ $count == 0 ]] ; then
@@ -136,7 +145,7 @@ function gcs_upload {
 	    GSUTIL_OPTIONS[1]="GoogleCompute:service_account=default"
     fi
 
-    gsutil ${GSUTIL_OPTIONS[@]} cp - "$PATH_TO_BACKUP"
+    gsutil "${GSUTIL_OPTIONS[@]}" cp - "$PATH_TO_BACKUP"
 }
 
 function upload {