diff --git a/src/chunk.js b/src/chunk.js deleted file mode 100644 index 08c1ec001..000000000 --- a/src/chunk.js +++ /dev/null @@ -1,20 +0,0 @@ -'use strict'; - -exports = module.exports = chunk; - -const assert = require('assert'); - -function chunk(array, size) { - assert(Array.isArray(array)); - assert.strictEqual(typeof size, 'number'); - - const length = array.length; - if (!length) return []; - let index = 0, resIndex = 0, result = Array(Math.ceil(length / size)); - - for (; index < length; index += size) { - result[resIndex++] = array.slice(index, index+size); - } - - return result; -} diff --git a/src/storage/s3.js b/src/storage/s3.js index 6f4c58a10..46466eace 100644 --- a/src/storage/s3.js +++ b/src/storage/s3.js @@ -22,14 +22,14 @@ exports = module.exports = { // Used to mock AWS _mockInject: mockInject, - _mockRestore: mockRestore + _mockRestore: mockRestore, + _chunk: chunk }; const assert = require('assert'), async = require('async'), AwsSdk = require('aws-sdk'), BoxError = require('../boxerror.js'), - chunk = require('../chunk.js'), constants = require('../constants.js'), DataLayout = require('../datalayout.js'), debug = require('debug')('box:storage/s3'), @@ -406,6 +406,21 @@ async function remove(apiConfig, filename) { if (error) throw new BoxError(BoxError.EXTERNAL_ERROR, `Unable to remove ${deleteParams.Key}. error: ${error.message}`); } +function chunk(array, size) { + assert(Array.isArray(array)); + assert.strictEqual(typeof size, 'number'); + + const length = array.length; + if (!length) return []; + let index = 0, resIndex = 0, result = Array(Math.ceil(length / size)); + + for (; index < length; index += size) { + result[resIndex++] = array.slice(index, index+size); + } + + return result; +} + async function removeDir(apiConfig, pathPrefix, progressCallback) { assert.strictEqual(typeof apiConfig, 'object'); assert.strictEqual(typeof pathPrefix, 'string'); diff --git a/src/test/storage-test.js b/src/test/storage-test.js index 7ce53da98..fb96bed34 100644 --- a/src/test/storage-test.js +++ b/src/test/storage-test.js @@ -7,7 +7,6 @@ 'use strict'; const BoxError = require('../boxerror.js'), - chunk = require('../chunk.js'); common = require('./common.js'), execSync = require('child_process').execSync, expect = require('expect.js'), @@ -24,6 +23,8 @@ const BoxError = require('../boxerror.js'), safe = require('safetydance'), settings = require('../settings.js'); +const chunk = s3._chunk; + describe('Storage', function () { const { setup, cleanup } = common;