Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/api/apiUtils/object/createAndStoreObject.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ function createAndStoreObject(bucketName, bucketMD, objectKey, objMD, authInfo,
if (mdOnlyHeader === 'true' && mdOnlySize > 0) {
log.debug('metadata only operation x-amz-meta-mdonly');
const md5 = request.headers['x-amz-meta-md5chksum']
? new Buffer(request.headers['x-amz-meta-md5chksum'],
? Buffer.from(request.headers['x-amz-meta-md5chksum'],
'base64').toString('hex') : null;
const numParts = request.headers['x-amz-meta-md5numparts'];
let _md5;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zenko/cloudserver",
"version": "9.0.24",
"version": "9.0.25",
"description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
"main": "index.js",
"engines": {
Expand Down
54 changes: 27 additions & 27 deletions tests/multipleBackend/routes/routeBackbeat.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ describe('backbeat routes', () => {
it('should update metadata of a current null version', done => {
let objMD;
return async.series({
putObject: next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
putObject: next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
enableVersioningSource: next => s3.putBucketVersioning(
{ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } }, next),
getMetadata: next => makeBackbeatRequest({
Expand Down Expand Up @@ -420,11 +420,11 @@ describe('backbeat routes', () => {
let expectedVersionId;
return async.series({
putObjectInitial: next => s3.putObject(
{ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
{ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
enableVersioning: next => s3.putBucketVersioning(
{ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } }, next),
putObjectAgain: next => s3.putObject(
{ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -656,7 +656,7 @@ describe('backbeat routes', () => {
it('should update metadata of a non-version object', done => {
let objMD;
return async.series([
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => makeBackbeatRequest({
method: 'GET',
resourceType: 'metadata',
Expand Down Expand Up @@ -717,7 +717,7 @@ describe('backbeat routes', () => {
return async.series([
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => makeBackbeatRequest({
method: 'GET',
resourceType: 'metadata',
Expand Down Expand Up @@ -781,7 +781,7 @@ describe('backbeat routes', () => {
return async.series([
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => makeBackbeatRequest({
method: 'GET',
resourceType: 'metadata',
Expand Down Expand Up @@ -843,7 +843,7 @@ describe('backbeat routes', () => {
return async.series([
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand All @@ -852,7 +852,7 @@ describe('backbeat routes', () => {
}),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => makeBackbeatRequest({
method: 'GET',
resourceType: 'metadata',
Expand Down Expand Up @@ -916,7 +916,7 @@ describe('backbeat routes', () => {
it('should update null version with no version id and versioning suspended', done => {
let objMD;
return async.series([
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
next),
next => makeBackbeatRequest({
Expand Down Expand Up @@ -978,7 +978,7 @@ describe('backbeat routes', () => {
return async.series([
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => makeBackbeatRequest({
method: 'GET',
resourceType: 'metadata',
Expand Down Expand Up @@ -1039,7 +1039,7 @@ describe('backbeat routes', () => {
return async.series([
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => makeBackbeatRequest({
method: 'GET',
resourceType: 'metadata',
Expand Down Expand Up @@ -1071,7 +1071,7 @@ describe('backbeat routes', () => {
authCredentials: backbeatAuthCredentials,
requestBody: objMD,
}, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => s3.headObject({ Bucket: bucket, Key: keyName, VersionId: 'null' }, next),
next => s3.listObjectVersions({ Bucket: bucket }, next),
], (err, data) => {
Expand Down Expand Up @@ -1102,7 +1102,7 @@ describe('backbeat routes', () => {
return async.series([
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Suspended' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => makeBackbeatRequest({
method: 'GET',
resourceType: 'metadata',
Expand Down Expand Up @@ -1136,7 +1136,7 @@ describe('backbeat routes', () => {
}, next),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -1171,10 +1171,10 @@ describe('backbeat routes', () => {
let expectedVersionId;
let objMD;
return async.series([
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -1245,10 +1245,10 @@ describe('backbeat routes', () => {
let objMD;
let expectedVersionId;
return async.series([
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -1317,10 +1317,10 @@ describe('backbeat routes', () => {
let objMD;
let deletedVersionId;
return async.series([
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -1361,7 +1361,7 @@ describe('backbeat routes', () => {
authCredentials: backbeatAuthCredentials,
requestBody: objMD,
}, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => s3.headObject({ Bucket: bucket, Key: keyName, VersionId: 'null' }, next),
next => s3.listObjectVersions({ Bucket: bucket }, next),
], (err, data) => {
Expand Down Expand Up @@ -1391,10 +1391,10 @@ describe('backbeat routes', () => {
let deletedVersionId;
let expectedVersionId;
return async.series([
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, next),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -1437,7 +1437,7 @@ describe('backbeat routes', () => {
}, next),
next => s3.putBucketVersioning({ Bucket: bucket, VersioningConfiguration: { Status: 'Enabled' } },
next),
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
next => s3.putObject({ Bucket: bucket, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -1726,7 +1726,7 @@ describe('backbeat routes', () => {
next => s3.putObject({
Bucket: bucket,
Key: 'sourcekey',
Body: new Buffer(testData) },
Body: Buffer.from(testData) },
next),
(resp, next) => makeBackbeatRequest({
method: 'GET',
Expand Down Expand Up @@ -2542,7 +2542,7 @@ describe('backbeat routes', () => {
done => s3.putObject({
Bucket: TEST_BUCKET,
Key: testKey,
Body: new Buffer('hello'),
Body: Buffer.from('hello'),
}, (err, data) => {
assert.ifError(err);
versionId = data.VersionId;
Expand Down Expand Up @@ -2600,7 +2600,7 @@ describe('backbeat routes', () => {
done => awsClient.putObject({
Bucket: awsBucket,
Key: awsKey,
Body: new Buffer('hello'),
Body: Buffer.from('hello'),
}, (err, data) => {
assert.ifError(err);
versionId = data.VersionId;
Expand Down
18 changes: 9 additions & 9 deletions tests/multipleBackend/routes/routeBackbeatForReplication.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ describe(`backbeat routes for replication (${name})`, () => {
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
putObject: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -177,7 +177,7 @@ describe(`backbeat routes for replication (${name})`, () => {
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
putObject: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -261,7 +261,7 @@ describe(`backbeat routes for replication (${name})`, () => {
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
putObject: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -338,7 +338,7 @@ describe(`backbeat routes for replication (${name})`, () => {
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
putObject: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -390,15 +390,15 @@ describe(`backbeat routes for replication (${name})`, () => {
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
putObjectNonCurrent: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
versionIdNonCurrent = data.VersionId;
return next();
}),
putObjectCurrent: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -492,7 +492,7 @@ describe(`backbeat routes for replication (${name})`, () => {
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
putObject: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, (err, data) => {
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, (err, data) => {
if (err) {
return next(err);
}
Expand Down Expand Up @@ -590,7 +590,7 @@ describe(`backbeat routes for replication (${name})`, () => {

async.series({
putObject: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, next),
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, next),
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
enableVersioningDestination: next => dstS3.putBucketVersioning(
Expand Down Expand Up @@ -652,7 +652,7 @@ describe(`backbeat routes for replication (${name})`, () => {
suspendVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Suspended' } }, next),
putObject: next => srcS3.putObject(
{ Bucket: bucketSource, Key: keyName, Body: new Buffer(testData) }, next),
{ Bucket: bucketSource, Key: keyName, Body: Buffer.from(testData) }, next),
enableVersioningSource: next => srcS3.putBucketVersioning(
{ Bucket: bucketSource, VersioningConfiguration: { Status: 'Enabled' } }, next),
enableVersioningDestination: next => dstS3.putBucketVersioning(
Expand Down
Loading
Loading