Merge branch 'feature/CLDSRV-745/bump-arsenal' into tmp/octopus/w/9.1/feature/CLDSRV-745/bump-arsenal

Author: bert-e

package.json

@@ -19,9 +19,9 @@
   },
   "homepage": "https://github.com/scality/S3#readme",
   "dependencies": {
-    "@azure/storage-blob": "^12.25.0",
+    "@azure/storage-blob": "^12.28.0",
     "@hapi/joi": "^17.1.1",
-    "arsenal": "git+https://github.com/scality/Arsenal#8.2.28",
+    "arsenal": "git+https://github.com/scality/Arsenal#8.2.30",
     "async": "2.6.4",
     "aws-sdk": "^2.1692.0",
     "bucketclient": "scality/bucketclient#8.2.5",
@@ -73,7 +73,6 @@
     "tv4": "^1.3.0"
   },
   "resolutions": {
-    "string-width": "4.2.3",
     "jsonwebtoken": "^9.0.0",
     "nan": "v2.22.0"
   },

tests/functional/aws-node-sdk/test/multipleBackend/utils.js

@@ -146,6 +146,7 @@ utils.getAzureClient = () => {
             params[key] = envVariable;
             return true;
         }
+
         if (config.locationConstraints[azureLocation] &&
             config.locationConstraints[azureLocation].details &&
             config.locationConstraints[azureLocation].details[key]) {

tests/functional/aws-node-sdk/test/object/copyPart.js

@@ -580,69 +580,86 @@ describe('Object Part Copy', () => {
             });
 
             it('should not corrupt object if overwriting an existing part by copying a part ' +
-            'while the MPU is being completed', () => {
-                // AWS response etag for this completed MPU
-                const finalObjETag = '"db77ebbae9e9f5a244a26b86193ad818-1"';
-                process.stdout.write('Putting first part in MPU test');
-                return s3.uploadPartCopy({ Bucket: destBucketName,
-                    Key: destObjName,
-                    CopySource: `${sourceBucketName}/${sourceObjName}`,
-                    PartNumber: 1,
-                    UploadId: uploadId,
-                }).promise().then(res => {
+            'while the MPU is being completed', async () => {
+                    const finalObjETag = '"db77ebbae9e9f5a244a26b86193ad818-1"';
+                    process.stdout.write('Putting first part in MPU test"');
+                    const randomDestObjName = `copycatobject${Math.floor(Math.random() * 100000)}`;
+
+                    const initiateRes = await s3
+                      .createMultipartUpload({
+                        Bucket: destBucketName,
+                        Key: randomDestObjName,
+                      })
+                      .promise();
+                    const uploadId = initiateRes.UploadId;
+
+                    const res = await s3
+                      .uploadPartCopy({
+                        Bucket: destBucketName,
+                        Key: randomDestObjName,
+                        CopySource: `${sourceBucketName}/${sourceObjName}`,
+                        PartNumber: 1,
+                        UploadId: uploadId,
+                      })
+                      .promise();
                     assert.strictEqual(res.ETag, etag);
                     assert(res.LastModified);
-                }).then(() => {
-                    process.stdout.write('Overwriting first part in MPU test and completing MPU ' +
-                                         'at the same time');
-                    return Promise.all([
-                        s3.uploadPartCopy({
-                            Bucket: destBucketName,
-                            Key: destObjName,
-                            CopySource: `${sourceBucketName}/${sourceObjName}`,
-                            PartNumber: 1,
-                            UploadId: uploadId,
-                        }).promise().catch(err => {
-                            // in case the CompleteMPU finished
-                            // earlier, we may get a NoSuchKey error,
-                            // so just ignore it and resolve with a
-                            // special value, otherwise re-throw the
-                            // error
-                            if (err && err.code === 'NoSuchKey') {
-                                return Promise.resolve(null);
-                            }
-                            throw err;
+
+                    process.stdout.write(
+                      'Overwriting first part in MPU test and completing MPU at the same time',
+                    );
+                    const [completeRes, uploadRes] = await Promise.all([
+                      s3
+                        .completeMultipartUpload({
+                          Bucket: destBucketName,
+                          Key: randomDestObjName,
+                          UploadId: uploadId,
+                          MultipartUpload: {
+                            Parts: [{ ETag: etag, PartNumber: 1 }],
+                          },
+                        })
+                        .promise()
+                        .catch(err => {
+                          throw err;
+                        }),
+                      s3
+                        .uploadPartCopy({
+                          Bucket: destBucketName,
+                          Key: randomDestObjName,
+                          CopySource: `${sourceBucketName}/${sourceObjName}`,
+                          PartNumber: 1,
+                          UploadId: uploadId,
+                        })
+                        .promise()
+                        .catch(err => {
+                          const completeMPUFinishedEarlier =
+                            err && err.code === 'NoSuchKey';
+                          if (completeMPUFinishedEarlier) {
+                            return Promise.resolve(null);
+                          }
+
+                          throw err;
                         }),
-                        s3.completeMultipartUpload({
-                            Bucket: destBucketName,
-                            Key: destObjName,
-                            UploadId: uploadId,
-                            MultipartUpload: {
-                                Parts: [
-                                    { ETag: etag, PartNumber: 1 },
-                                ],
-                            },
-                        }).promise(),
                     ]);
-                }).then(([uploadRes, completeRes]) => {
-                    // if upload succeeded before CompleteMPU finished
+
                     if (uploadRes !== null) {
-                        assert.strictEqual(uploadRes.ETag, etag);
-                        assert(uploadRes.LastModified);
+                      assert.strictEqual(uploadRes.ETag, etag);
+                      assert(uploadRes.LastModified);
                     }
+
                     assert.strictEqual(completeRes.Bucket, destBucketName);
-                    assert.strictEqual(completeRes.Key, destObjName);
+                    assert.strictEqual(completeRes.Key, randomDestObjName);
                     assert.strictEqual(completeRes.ETag, finalObjETag);
-                }).then(() => {
-                    process.stdout.write('Getting object put by MPU with ' +
-                    'overwrite part');
-                    return s3.getObject({
+                    process.stdout.write(
+                      'Getting object put by MPU with ' + 'overwrite part',
+                    );
+                    const resGet = await s3
+                      .getObject({
                         Bucket: destBucketName,
-                        Key: destObjName,
-                    }).promise();
-                }).then(res => {
-                    assert.strictEqual(res.ETag, finalObjETag);
-                });
+                        Key: randomDestObjName,
+                      })
+                      .promise();
+                    assert.strictEqual(resGet.ETag, finalObjETag);
             });
         });