reintroduce the gcpApis instead of redefining them

benzekrimaha · benzekrimaha · commit 06a61a295e4d · 2025-12-18T15:03:36.000+01:00
diff --git a/lib/storage/data/external/GCP/GcpApis/putObject.js b/lib/storage/data/external/GCP/GcpApis/putObject.js
@@ -1,11 +1,50 @@
-const { getPutTagsMetadata } = require('../GcpUtils');
+const { PutObjectCommand } = require('@aws-sdk/client-s3');
+
+const { getPutTagsMetadata, getHeaderCaseInsensitive } = require('../GcpUtils');
 
 function putObject(params, callback) {
-    const putParams = Object.assign({}, params);
+    const putParams = { ...params };
     putParams.Metadata = getPutTagsMetadata(putParams.Metadata, params.Tagging);
     delete putParams.Tagging;
-    // error handling will be by the actual putObject request
-    return this.putObjectReq(putParams, callback);
+
+    const command = new PutObjectCommand(putParams);
+
+    let objectGeneration;
+    command.middlewareStack.add(
+        next => async args => {
+            const result = await next(args);
+            const generationHeader = getHeaderCaseInsensitive(
+                result.response?.headers,
+                'x-goog-generation'
+            );
+            if (generationHeader !== undefined) {
+                objectGeneration = generationHeader;
+            }
+            return result;
+        },
+        {
+            step: 'deserialize',
+            name: 'captureGcpHeaders',
+        }
+    );
+
+    return this.send(command)
+        .then(data => {
+            const result = { ...data };
+            if (objectGeneration) {
+                result.VersionId = objectGeneration;
+            }
+            if (callback) {
+                return callback(null, result);
+            }
+            return result;
+        })
+        .catch(err => {
+            if (callback) {
+                return callback(err);
+            }
+            throw err;
+        });
 }
 
 module.exports = putObject;
diff --git a/lib/storage/data/external/GCP/GcpApis/uploadPart.js b/lib/storage/data/external/GCP/GcpApis/uploadPart.js
@@ -30,7 +30,7 @@ function uploadPart(params, callback) {
         Body: params.Body,
         ContentLength: params.ContentLength,
     };
-    return this.putObjectReq(mpuParams, (err, res) => {
+    return this.putObject(mpuParams, (err, res) => {
         if (err) {
             logHelper(logger, 'error',
                 'error in uploadPart - putObject', err);
diff --git a/lib/storage/data/external/GCP/GcpService.js b/lib/storage/data/external/GCP/GcpService.js
@@ -1,16 +1,7 @@
 const errorInstances = require('../../../../errors').errorInstances;
 const constructStringToSignV2 = require('../../../../auth/v2/constructStringToSign').default;
 const crypto = require('crypto');
-const getPutTagsMetadata = require('./GcpUtils').getPutTagsMetadata;
-const processTagSet = require('./GcpUtils').processTagSet;
 const GcpManagedUpload = require('../GCP/GcpManagedUpload');
-const async = require('async');
-const createMpuKey = require('./GcpUtils').createMpuKey;
-const getPartNumber = require('./GcpUtils').getPartNumber;
-const MpuHelper = require('./GcpApis/mpuHelper');
-const { v4: uuid } = require('uuid');
-const stripTags = require('./GcpUtils').stripTags;
-const retrieveTags = require('./GcpUtils').retrieveTags;
 const { S3Client,
     PutObjectCommand,
     GetObjectCommand,
@@ -24,6 +15,8 @@ const { S3Client,
     GetBucketVersioningCommand,
 } = require('@aws-sdk/client-s3');
 const { createNormalizeHeadersMiddleware } = require('../../../../utils/normalizeHeaders');
+const { getHeaderCaseInsensitive } = require('./GcpUtils');
+const gcpApis = require('./GcpApis');
 
 /**
  * GcpClient: S3-compatible client for Google Cloud Storage using AWS SDK v3.
@@ -84,46 +77,6 @@ class GcpClient extends S3Client {
         );
     }
 
-    /**
-     * Upload an object to GCP (with optional tagging as metadata).
-     * @param {object} params - S3 putObject params
-     * @param {function} callback
-     */
-    putObject(params, callback) {
-        const command = new PutObjectCommand(params);
-        
-        // Capture GCP-specific headers
-        let objectGeneration;
-        command.middlewareStack.add(
-            next => async args => {
-                const result = await next(args);
-                const generationHeader = getHeaderCaseInsensitive(
-                    result.response?.headers,
-                    'x-goog-generation'
-                );
-                if (generationHeader !== undefined) {
-                    objectGeneration = generationHeader;
-                }
-                return result;
-            },
-            {
-                step: 'deserialize',
-                name: 'captureGcpHeaders',
-            }
-        );
-        
-        return this.send(command)
-            .then(data => {
-                // Add GCP-specific fields
-                const result = { ...data };
-                if (objectGeneration) {
-                    result.VersionId = objectGeneration;
-                }
-                return callback && callback(null, result);
-            })
-            .catch(err => callback?.(err));
-    }
-
     listBuckets(params, callback) {
         return callback(errorInstances.NotImplemented
             .customizeDescription('GCP: listBuckets not implemented'));
@@ -283,16 +236,6 @@ class GcpClient extends S3Client {
             .customizeDescription('GCP: deleteBucketCors not implemented'));
     }
 
-    putObjectTagging(params, callback) {
-        return callback(errorInstances.NotImplemented
-            .customizeDescription('GCP: putObjectTagging not implemented'));
-    }
-
-    deleteObjectTagging(params, callback) {
-        return callback(errorInstances.NotImplemented
-            .customizeDescription('GCP: deleteObjectTagging not implemented'));
-    }
-
     putObjectAcl(params, callback) {
         return callback(errorInstances.NotImplemented
             .customizeDescription('GCP: putObjectAcl not implemented'));
@@ -318,182 +261,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
-                .customizeDescription('Missing required parameter');
-            return callback(error);
-        }
-        const uploadId = uuid().replace(/-/g, '');
-        const mpuParams = {
-            Bucket: params.Bucket,
-            Key: createMpuKey(params.Key, uploadId, 'init'),
-            Metadata: params.Metadata,
-            ContentType: params.ContentType,
-            CacheControl: params.CacheControl,
-            ContentDisposition: params.ContentDisposition,
-            ContentEncoding: params.ContentEncoding,
-        };
-        mpuParams.Metadata = getPutTagsMetadata(mpuParams.Metadata, params.Tagging);
-        return this.putObject(mpuParams, err => {
-            if (err) {
-                return callback(err);
-            }
-            return callback(null, { UploadId: uploadId });
-        });
-    }
-    */
-
-    /**
-     * Upload a part for MPU (emulated for GCP).
-     * @param {object} params - S3 uploadPart params
-     * @param {function} callback
-     */
-    uploadPart(params, callback) {
-        if (!params || !params.UploadId || !params.Bucket || !params.Key) {
-            const error = errorInstances.InvalidRequest
-                .customizeDescription('Missing required parameter');
-            return callback(error);
-        }
-        const partNumber = getPartNumber(params.PartNumber);
-        if (!partNumber) {
-            const error = errorInstances.InvalidArgument
-                .customizeDescription('PartNumber is invalid');
-            return callback(error);
-        }
-        const mpuParams = {
-            Bucket: params.Bucket,
-            Key: createMpuKey(params.Key, params.UploadId, partNumber),
-            Body: params.Body,
-            ContentLength: params.ContentLength,
-        };
-        return this.putObject(mpuParams, callback);
-    }
-
-    /**
-     * Upload a part by copying from an existing object (emulated for GCP).
-     * @param {object} params - S3 uploadPartCopy params
-     * @param {function} callback
-     */
-    uploadPartCopy(params, callback) {
-        if (!params || !params.UploadId || !params.Bucket || !params.Key || !params.CopySource) {
-            const error = errorInstances.InvalidRequest
-                .customizeDescription('Missing required parameter');
-            return callback(error);
-        }
-        const partNumber = getPartNumber(params.PartNumber);
-        if (!partNumber) {
-            const error = errorInstances.InvalidArgument
-                .customizeDescription('PartNumber is not a number');
-            return callback(error);
-        }
-        const mpuParams = {
-            Bucket: params.Bucket,
-            Key: createMpuKey(params.Key, params.UploadId, partNumber),
-            CopySource: params.CopySource,
-        };
-        return this.copyObject(mpuParams, callback);
-    }
-
-    /**
-     * Complete a multipart upload (emulated for GCP).
-     * @param {object} params - S3 completeMultipartUpload params
-     * @param {function} callback
-     */
-    completeMultipartUpload(params, callback) {
-        if (!params || !params.MultipartUpload ||
-            !params.MultipartUpload.Parts || !params.UploadId ||
-            !params.Bucket || !params.Key) {
-            const error = errorInstances.InvalidRequest
-                .customizeDescription('Missing required parameter');
-            return callback(error);
-        }
-        const partList = params.MultipartUpload.Parts;
-        if (partList.length === 0) {
-            const error = errorInstances.InvalidRequest
-                .customizeDescription('You must specify at least one part');
-            return callback(error);
-        }
-        for (let ind = 1; ind < partList.length; ++ind) {
-            if (partList[ind - 1].PartNumber >= partList[ind].PartNumber) {
-                return callback(errorInstances.InvalidPartOrder);
-            }
-        }
-        const mpuHelper = new MpuHelper(this);
-        return async.waterfall([
-            next => mpuHelper.splitMerge(params, partList, 'compose', next),
-            (numParts, next) => {
-                mpuHelper.composeFinal(numParts, params, next);
-            },
-            (result, next) => {
-                mpuHelper.generateMpuResult(result, partList, next);
-            },
-            (result, aggregateETag, next) => {
-                mpuHelper.copyToMain(result, aggregateETag, params, next);
-            },
-            (mpuResult, next) => {
-                const delParams = {
-                    Bucket: params.Bucket,
-                    MPU: params.MPU,
-                    Prefix: createMpuKey(params.Key, params.UploadId),
-                };
-                mpuHelper.removeParts(delParams, err => {
-                    next(err, mpuResult);
-                });
-            },
-        ], (err, result) => {
-            callback(err, result);
-        });
-    }
-
-    /**
-     * Abort a multipart upload (emulated for GCP).
-     * @param {object} params - S3 abortMultipartUpload params
-     * @param {function} callback
-     */
-    abortMultipartUpload(params, callback) {
-        if (!params || !params.Key || !params.UploadId || !params.Bucket || !params.MPU) {
-            const error = errorInstances.InvalidRequest
-                .customizeDescription('Missing required parameter');
-            return callback(error);
-        }
-        const mpuHelper = new MpuHelper(this);
-        const delParams = {
-            Bucket: params.Bucket,
-            MPU: params.MPU,
-            Prefix: createMpuKey(params.Key, params.UploadId),
-        };
-        return mpuHelper.removeParts(delParams, callback);
-    }
-
-    /**
-     * List parts of a multipart upload (emulated for GCP).
-     * @param {object} params - S3 listParts params
-     * @param {function} callback
-     */
-    listParts(params, callback) {
-        if (!params || !params.UploadId || !params.Bucket || !params.Key) {
-            const error = errorInstances.InvalidRequest
-                .customizeDescription('Missing required parameter');
-            return callback(error);
-        }
-        if (params.PartNumberMarker && params.PartNumberMarker < 0) {
-            return callback(errorInstances.InvalidArgument
-                .customizeDescription('The request specified an invalid marker'));
-        }
-        const mpuParams = {
-            Bucket: params.Bucket,
-            Prefix: createMpuKey(params.Key, params.UploadId, 'parts'),
-            Marker: createMpuKey(params.Key, params.UploadId, params.PartNumberMarker, 'parts'),
-            MaxKeys: params.MaxParts,
-        };
-        return this.listObjects(mpuParams, callback);
-    }
-
     /**
      * List objects in a bucket.
      * @param {object} params - S3 listObjects params
@@ -566,12 +333,7 @@ class GcpClient extends S3Client {
                 throw err;
             });
     }
-
-    getObjectTagging(params, callback) {
-        return callback(errorInstances.NotImplemented
-            .customizeDescription('GCP: getObjectTagging not implemented'));
-    }
-
+    
     /**
      * Get an object (callback style for test compatibility).
      */
@@ -862,28 +624,6 @@ function gcpSigningMiddleware(config) {
     };
 }
 
-function getHeaderCaseInsensitive(headers, headerName) {
-    if (!headers) {
-        return undefined;
-    }
-
-    const normalized = headerName.toLowerCase();
-    if (headers[normalized] !== undefined) {
-        return headers[normalized];
-    }
-
-    const direct = headers[headerName];
-    if (direct !== undefined) {
-        return direct;
-    }
-
-    for (const key of Object.keys(headers)) {
-        if (key.toLowerCase() === normalized) {
-            return headers[key];
-        }
-    }
-
-    return undefined;
-}
+Object.assign(GcpClient.prototype, gcpApis);
 
 module.exports = GcpClient;
diff --git a/lib/storage/data/external/GCP/GcpUtils.js b/lib/storage/data/external/GCP/GcpUtils.js
