post review fixups

Author: benzekrimaha

lib/auth/v2/getCanonicalizedAmzHeaders.ts

@@ -14,9 +14,6 @@ export default function getCanonicalizedAmzHeaders(headers: ArsenalRequestHeader
         .filter(filterFn)
         .map(val => {
             const headerValue = headers[val];
-            // AWS SDK v3 can pass header values as arrays (for multiple values),
-            // strings, or other types. We need to normalize them before calling .trim()
-            // Per HTTP spec and AWS Signature v2, multiple values are joined with commas
             const stringValue = normalizeHeaderValue(headerValue);
             return [val.trim(), stringValue.trim()];
         });

lib/storage/data/external/AwsClient.js

@@ -28,6 +28,7 @@ const { prepareStream } = require('../../../s3middleware/prepareStream');
 const { createLogger, logHelper, removeQuotes, trimXMetaPrefix } = 
     require('./utils');
 const jsutil = require('../../../jsutil');
+const { callbackify } = require('util');
 
 const missingVerIdInternalError = errorInstances.InternalError.customizeDescription(
     'Invalid state. Please ensure versioning is enabled ' +
@@ -53,16 +54,16 @@ class AwsClient {
         if (typeof cb !== 'function') {
             throw new TypeError('AwsClient.setup requires a callback function');
         }
-        const done = jsutil.once(cb);
-        try {
+
+        const run = callbackify(async () => {
             const usEast1Client = new S3Client({
                 ...this._client.config,
                 region: 'us-east-1',
             });
 
             const applyRegion = region => {
                 if (!region) {
-                    return done();
+                    return;
                 }
 
                 const isAWS = this._s3Params.endpoint?.endsWith('amazonaws.com');
@@ -82,29 +83,27 @@ class AwsClient {
                 }
 
                 this._client = new S3Client(newConfig);
-                return done();
             };
 
-            return usEast1Client.send(
-                new GetBucketLocationCommand({ Bucket: this._awsBucketName })
-            ).then(res => applyRegion(res.LocationConstraint))
-             .catch(err => {
+            try {
+                const res = await usEast1Client.send(
+                    new GetBucketLocationCommand({ Bucket: this._awsBucketName })
+                );
+                applyRegion(res.LocationConstraint);
+            } catch (err) {
                 if (err.name === 'AuthorizationHeaderMalformed') {
-                    return applyRegion(err.region);
+                    applyRegion(err.region);
+                    return;
                 }
                 this._logger.error('error during setup', {
                     error: err,
                     method: 'AwsClient.setup',
                 });
-                return done(err);
-            });
-        } catch (err) {
-            this._logger.error('unexpected error during setup', {
-                error: err,
-                method: 'AwsClient.setup',
-            });
-            return done(err);
-        }
+                throw err;
+            }
+        });
+
+        return run(cb);
     }
 
     _createAwsKey(requestBucketName, requestObjectKey,
@@ -128,13 +127,12 @@ class AwsClient {
         const metaHeaders = trimXMetaPrefix(keyContext.metaHeaders);
         const log = createLogger(reqUids);
 
-        const putCb = async (err, data) => {
+        const putCb = (err, data) => {
             if (err) {
                 logHelper(log, 'error', 'err from data backend',
                     err, this._dataStoreName, this.clientType);
                 return callback(errorInstances.ServiceUnavailable
-                    .customizeDescription('Error returned from ' +
-                `${this.type}: ${err.message}`),
+                    .customizeDescription(`Error returned from ${this.type}: ${err.message}`),
                 );
             }
             let dataStoreVersionId = data.VersionId;
@@ -636,6 +634,7 @@ class AwsClient {
                 `${this.type}: ${err.message}`));
         });
     }
+
     uploadPartCopy(request, awsSourceKey, sourceLocationConstraintName, config, log, callback) {
         const destBucketName = request.bucketName;
         const destObjectKey = request.objectKey;

lib/storage/data/external/GCP/GcpService.js

@@ -322,7 +322,6 @@ class GcpClient extends S3Client {
      * Initiate a multipart upload (emulated for GCP).
      * @param {object} params - S3 createMultipartUpload params
      * @param {function} callback
-     */
     createMultipartUpload(params, callback) {
         if (!params || !params.Bucket || !params.Key) {
             const error = errorInstances.InvalidRequest
@@ -347,6 +346,7 @@ class GcpClient extends S3Client {
             return callback(null, { UploadId: uploadId });
         });
     }
+    */
 
     /**
      * Upload a part for MPU (emulated for GCP).