Merge remote-tracking branch 'origin/w/8.8/improvement/CLDSRV-621-backport-bucketownerid' into w/9.0/improvement/CLDSRV-621-backport-bucketownerid

Author: BourgoisMickael

lib/api/apiUtils/object/createAndStoreObject.js

@@ -194,7 +194,7 @@ function createAndStoreObject(bucketName, bucketMD, objectKey, objMD, authInfo,
         metadataStoreParams.oldReplayId = objMD.uploadId;
     }
 
-    if (authInfo.getCanonicalID() != bucketMD.getOwner()) {
+    if (authInfo.getCanonicalID() !== bucketMD.getOwner()) {
         metadataStoreParams.bucketOwnerId = bucketMD.getOwner();
     }
 

tests/unit/api/multipartUpload.js

@@ -2764,7 +2764,7 @@ describe('complete mpu with bucket policy', () => {
                 json.InitiateMultipartUploadResult.UploadId[0];
             const md5Hash = crypto.createHash('md5').update(partBody);
             const calculatedHash = md5Hash.digest('hex');
-            const partRequest = new DummyRequest({
+            const partRequest = new DummyRequest(Object.assign({
                 bucketName,
                 namespace,
                 objectKey,
@@ -2786,7 +2786,7 @@ describe('complete mpu with bucket policy', () => {
                 socket: {
                     remoteAddress: '1.1.1.1',
                 },
-            }, partBody);
+            }, requestFix), partBody);
             objectPutPart(authInfoOtherAcc, partRequest, undefined, log, err => {
                 assert.ifError(err);
                 const completeBody = '<CompleteMultipartUpload>' +
@@ -2795,7 +2795,7 @@ describe('complete mpu with bucket policy', () => {
                     `<ETag>"${calculatedHash}"</ETag>` +
                     '</Part>' +
                     '</CompleteMultipartUpload>';
-                const completeRequest = {
+                const completeRequest = new DummyRequest(Object.assign({
                     bucketName,
                     namespace,
                     objectKey,
@@ -2808,7 +2808,7 @@ describe('complete mpu with bucket policy', () => {
                     socket: {
                         remoteAddress: '1.1.1.1',
                     },
-                };
+                }, requestFix));
                 completeMultipartUpload(authInfoOtherAcc,
                     completeRequest, log, err => {
                         assert.ifError(err);

tests/unit/api/objectCopy.js

@@ -141,7 +141,7 @@ describe('objectCopy with versioning', () => {
                     metadata.putObjectMD.lastCall,
                     destBucketName,
                     objectKey,
-                    sinon.match({ _data: { bucketOwnerId: sinon.match.typeOf('undefined') }}),
+                    sinon.match({ _data: { bucketOwnerId: sinon.match.typeOf('undefined') } }),
                     sinon.match.any,
                     sinon.match.any,
                     sinon.match.any
@@ -171,7 +171,7 @@ describe('objectCopy with versioning', () => {
                         Principal: { AWS: `arn:aws:iam::${authInfo2.shortid}:root` },
                         Action: ['s3:GetObject'],
                         Resource: [
-                            `arn:aws:s3:::${sourceBucketName}/*`
+                            `arn:aws:s3:::${sourceBucketName}/*`,
                         ],
                     },
                 ],
@@ -192,7 +192,7 @@ describe('objectCopy with versioning', () => {
                         Principal: { AWS: `arn:aws:iam::${authInfo2.shortid}:root` },
                         Action: ['s3:PutObject'],
                         Resource: [
-                            `arn:aws:s3:::${destBucketName}/*`
+                            `arn:aws:s3:::${destBucketName}/*`,
                         ],
                     },
                 ],
@@ -208,14 +208,14 @@ describe('objectCopy with versioning', () => {
                             metadata.putObjectMD.lastCall,
                             destBucketName,
                             objectKey,
-                            sinon.match({_data: { bucketOwnerId: authInfo.canonicalID }}),
+                            sinon.match({ _data: { bucketOwnerId: authInfo.canonicalID } }),
                             sinon.match.any,
                             sinon.match.any,
                             sinon.match.any
                         );
                         assert.ifError(err);
                         done();
-                });
+                    });
             });
         });
     });

tests/unit/api/objectPut.js

@@ -775,7 +775,7 @@ describe('objectPut API', () => {
         }, postBody);
 
         bucketPut(authInfo, testPutBucketRequest, log, () => {
-                objectPut(authInfo, testPutObjectRequest, undefined, log,
+            objectPut(authInfo, testPutObjectRequest, undefined, log,
                     err => {
                         assert.ifError(err);
                         sinon.assert.calledWith(metadata.putObjectMD.lastCall,