fix bulk test tool for ALWAYS_COMPRESS mode (#787)

* fix bulk test tool for possible compression, regardless of original

* remove unused import

tools/psoxy-test/lib/aws.js

@@ -24,6 +24,7 @@ import {
 import fs from 'fs';
 import getLogger from './logger.js';
 import _ from 'lodash';
+import zlib from 'node:zlib';
 
 
 /**
@@ -292,7 +293,12 @@ async function download(bucket, key, destination, options, client, logger) {
 
   // save file locally
   await new Promise((resolve, reject) => {
-    downloadResponse.Body.pipe(fs.createWriteStream(destination))
+    let stream = downloadResponse.Body;
+    if (downloadResponse.ContentEncoding?.toLowerCase() === 'gzip') {
+      stream = stream.pipe(zlib.createGunzip());
+    }
+    stream
+      .pipe(fs.createWriteStream(destination))
       .on('error', err => reject(err))
       .on('close', () => resolve())
   })

tools/psoxy-test/lib/gcp.js

@@ -247,7 +247,7 @@ async function download(bucketName, fileName, destination, client, logger) {
   }
 
   const downloadFunction = async () => client.bucket(bucketName).file(fileName)
-    .download({ destination: destination, decompress: false });
+    .download({ destination: destination, decompress: true });
   const onErrorStop = (error) => error.code !== 404;
 
   const downloadResponse = await executeWithRetry(downloadFunction, onErrorStop,

tools/psoxy-test/psoxy-test-file-upload.js

@@ -175,9 +175,7 @@ export default async function (options = {}) {
   let sanitizedDiffPath = sanitized;
   const isOriginalGzipped = await isGzipped(original);
   if (isOriginalGzipped) {
-    // Assume sanitized file is also gzipped
     originalDiffPath = await unzip(original);
-    sanitizedDiffPath = await unzip(sanitized);
   }
 
   let diff;