Skip to content

Commit f9d9541

Browse files
BourgoisMickaelBourgoisMickael
committed
Merge remote-tracking branch 'origin/bugfix/CLDSRV-735-deprecation-buffer' into w/9.1/bugfix/CLDSRV-735-deprecation-buffer
2 parents 83a1ab7 + 15c233b commit f9d9541

File tree

4 files changed

+40
-40
lines changed

4 files changed

+40
-40
lines changed

‎lib/api/apiUtils/object/createAndStoreObject.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function createAndStoreObject(bucketName, bucketMD, objectKey, objMD, authInfo,
224224
if (mdOnlyHeader === 'true' && mdOnlySize > 0) {
225225
log.debug('metadata only operation x-amz-meta-mdonly');
226226
const md5 = request.headers['x-amz-meta-md5chksum']
227-
? new Buffer(request.headers['x-amz-meta-md5chksum'],
227+
? Buffer.from(request.headers['x-amz-meta-md5chksum'],
228228
'base64').toString('hex') : null;
229229
const numParts = request.headers['x-amz-meta-md5numparts'];
230230
let _md5;

‎tests/multipleBackend/routes/routeBackbeat.js‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ describe('backbeat routes', () => {
339339
it('should update metadata of a current null version', done => {
340340
let objMD;
341341
return async.series({
342-
putObject: next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
342+
putObject: next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
343343
enableVersioningSource: next => s3.putBucketVersioning(
344344
{ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } }, next),
345345
getMetadata: next => makeBackbeatRequest({
@@ -420,11 +420,11 @@ describe('backbeat routes', () => {
420420
let expectedVersionId;
421421
return async.series({
422422
putObjectInitial: next => s3.putObject(
423-
{ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
423+
{ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
424424
enableVersioning: next => s3.putBucketVersioning(
425425
{ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } }, next),
426426
putObjectAgain: next => s3.putObject(
427-
{ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
427+
{ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
428428
if (err) {
429429
return next(err);
430430
}
@@ -656,7 +656,7 @@ describe('backbeat routes', () => {
656656
it('should update metadata of a non-version object', done => {
657657
let objMD;
658658
return async.series([
659-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
659+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
660660
next => makeBackbeatRequest({
661661
method: 'GET',
662662
resourceType: 'metadata',
@@ -717,7 +717,7 @@ describe('backbeat routes', () => {
717717
return async.series([
718718
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
719719
next),
720-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
720+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
721721
next => makeBackbeatRequest({
722722
method: 'GET',
723723
resourceType: 'metadata',
@@ -781,7 +781,7 @@ describe('backbeat routes', () => {
781781
return async.series([
782782
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
783783
next),
784-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
784+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
785785
next => makeBackbeatRequest({
786786
method: 'GET',
787787
resourceType: 'metadata',
@@ -843,7 +843,7 @@ describe('backbeat routes', () => {
843843
return async.series([
844844
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
845845
next),
846-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
846+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
847847
if (err) {
848848
return next(err);
849849
}
@@ -852,7 +852,7 @@ describe('backbeat routes', () => {
852852
}),
853853
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
854854
next),
855-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
855+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
856856
next => makeBackbeatRequest({
857857
method: 'GET',
858858
resourceType: 'metadata',
@@ -916,7 +916,7 @@ describe('backbeat routes', () => {
916916
it('should update null version with no version id and versioning suspended', done => {
917917
let objMD;
918918
return async.series([
919-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
919+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
920920
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
921921
next),
922922
next => makeBackbeatRequest({
@@ -978,7 +978,7 @@ describe('backbeat routes', () => {
978978
return async.series([
979979
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
980980
next),
981-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
981+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
982982
next => makeBackbeatRequest({
983983
method: 'GET',
984984
resourceType: 'metadata',
@@ -1039,7 +1039,7 @@ describe('backbeat routes', () => {
10391039
return async.series([
10401040
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
10411041
next),
1042-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1042+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
10431043
next => makeBackbeatRequest({
10441044
method: 'GET',
10451045
resourceType: 'metadata',
@@ -1071,7 +1071,7 @@ describe('backbeat routes', () => {
10711071
authCredentials: backbeatAuthCredentials,
10721072
requestBody: objMD,
10731073
}, next),
1074-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1074+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
10751075
next => s3.headObject({ Bucket: bucket, Key: keyName, VersionId: 'null' }, next),
10761076
next => s3.listObjectVersions({ Bucket: bucket }, next),
10771077
], (err, data) => {
@@ -1102,7 +1102,7 @@ describe('backbeat routes', () => {
11021102
return async.series([
11031103
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
11041104
next),
1105-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1105+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
11061106
next => makeBackbeatRequest({
11071107
method: 'GET',
11081108
resourceType: 'metadata',
@@ -1136,7 +1136,7 @@ describe('backbeat routes', () => {
11361136
}, next),
11371137
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
11381138
next),
1139-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
1139+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
11401140
if (err) {
11411141
return next(err);
11421142
}
@@ -1171,10 +1171,10 @@ describe('backbeat routes', () => {
11711171
let expectedVersionId;
11721172
let objMD;
11731173
return async.series([
1174-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1174+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
11751175
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
11761176
next),
1177-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
1177+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
11781178
if (err) {
11791179
return next(err);
11801180
}
@@ -1245,10 +1245,10 @@ describe('backbeat routes', () => {
12451245
let objMD;
12461246
let expectedVersionId;
12471247
return async.series([
1248-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1248+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
12491249
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
12501250
next),
1251-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
1251+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
12521252
if (err) {
12531253
return next(err);
12541254
}
@@ -1317,10 +1317,10 @@ describe('backbeat routes', () => {
13171317
let objMD;
13181318
let deletedVersionId;
13191319
return async.series([
1320-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1320+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
13211321
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
13221322
next),
1323-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
1323+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
13241324
if (err) {
13251325
return next(err);
13261326
}
@@ -1361,7 +1361,7 @@ describe('backbeat routes', () => {
13611361
authCredentials: backbeatAuthCredentials,
13621362
requestBody: objMD,
13631363
}, next),
1364-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1364+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
13651365
next => s3.headObject({ Bucket: bucket, Key: keyName, VersionId: 'null' }, next),
13661366
next => s3.listObjectVersions({ Bucket: bucket }, next),
13671367
], (err, data) => {
@@ -1391,10 +1391,10 @@ describe('backbeat routes', () => {
13911391
let deletedVersionId;
13921392
let expectedVersionId;
13931393
return async.series([
1394-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
1394+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
13951395
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
13961396
next),
1397-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
1397+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
13981398
if (err) {
13991399
return next(err);
14001400
}
@@ -1437,7 +1437,7 @@ describe('backbeat routes', () => {
14371437
}, next),
14381438
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
14391439
next),
1440-
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
1440+
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
14411441
if (err) {
14421442
return next(err);
14431443
}
@@ -1726,7 +1726,7 @@ describe('backbeat routes', () => {
17261726
next => s3.putObject({
17271727
Bucket: bucket,
17281728
Key: 'sourcekey',
1729-
Body: new Buffer(testData) },
1729+
Body: Buffer.from(testData) },
17301730
next),
17311731
(resp, next) => makeBackbeatRequest({
17321732
method: 'GET',
@@ -2542,7 +2542,7 @@ describe('backbeat routes', () => {
25422542
done => s3.putObject({
25432543
Bucket: TEST_BUCKET,
25442544
Key: testKey,
2545-
Body: new Buffer('hello'),
2545+
Body: Buffer.from('hello'),
25462546
}, (err, data) => {
25472547
assert.ifError(err);
25482548
versionId = data.VersionId;
@@ -2600,7 +2600,7 @@ describe('backbeat routes', () => {
26002600
done => awsClient.putObject({
26012601
Bucket: awsBucket,
26022602
Key: awsKey,
2603-
Body: new Buffer('hello'),
2603+
Body: Buffer.from('hello'),
26042604
}, (err, data) => {
26052605
assert.ifError(err);
26062606
versionId = data.VersionId;

‎tests/multipleBackend/routes/routeBackbeatForReplication.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ describe(`backbeat routes for replication (${name})`, () => {
112112
enableVersioningSource: next => srcS3.putBucketVersioning(
113113
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
114114
putObject: next => srcS3.putObject(
115-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
115+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
116116
if (err) {
117117
return next(err);
118118
}
@@ -177,7 +177,7 @@ describe(`backbeat routes for replication (${name})`, () => {
177177
enableVersioningSource: next => srcS3.putBucketVersioning(
178178
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
179179
putObject: next => srcS3.putObject(
180-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
180+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
181181
if (err) {
182182
return next(err);
183183
}
@@ -261,7 +261,7 @@ describe(`backbeat routes for replication (${name})`, () => {
261261
enableVersioningSource: next => srcS3.putBucketVersioning(
262262
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
263263
putObject: next => srcS3.putObject(
264-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
264+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
265265
if (err) {
266266
return next(err);
267267
}
@@ -338,7 +338,7 @@ describe(`backbeat routes for replication (${name})`, () => {
338338
enableVersioningSource: next => srcS3.putBucketVersioning(
339339
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
340340
putObject: next => srcS3.putObject(
341-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
341+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
342342
if (err) {
343343
return next(err);
344344
}
@@ -390,15 +390,15 @@ describe(`backbeat routes for replication (${name})`, () => {
390390
enableVersioningSource: next => srcS3.putBucketVersioning(
391391
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
392392
putObjectNonCurrent: next => srcS3.putObject(
393-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
393+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
394394
if (err) {
395395
return next(err);
396396
}
397397
versionIdNonCurrent = data.VersionId;
398398
return next();
399399
}),
400400
putObjectCurrent: next => srcS3.putObject(
401-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
401+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
402402
if (err) {
403403
return next(err);
404404
}
@@ -492,7 +492,7 @@ describe(`backbeat routes for replication (${name})`, () => {
492492
enableVersioningSource: next => srcS3.putBucketVersioning(
493493
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
494494
putObject: next => srcS3.putObject(
495-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
495+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
496496
if (err) {
497497
return next(err);
498498
}
@@ -590,7 +590,7 @@ describe(`backbeat routes for replication (${name})`, () => {
590590

591591
async.series({
592592
putObject: next => srcS3.putObject(
593-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, next),
593+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, next),
594594
enableVersioningSource: next => srcS3.putBucketVersioning(
595595
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
596596
enableVersioningDestination: next => dstS3.putBucketVersioning(
@@ -652,7 +652,7 @@ describe(`backbeat routes for replication (${name})`, () => {
652652
suspendVersioningSource: next => srcS3.putBucketVersioning(
653653
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Suspended' } }, next),
654654
putObject: next => srcS3.putObject(
655-
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, next),
655+
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, next),
656656
enableVersioningSource: next => srcS3.putBucketVersioning(
657657
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
658658
enableVersioningDestination: next => dstS3.putBucketVersioning(

0 commit comments

Comments
 (0)