From fe8b5217ce17ced039a74c007524d6761166e53b Mon Sep 17 00:00:00 2001 From: Brandon Cannaday Date: Fri, 12 Sep 2014 15:07:13 -0400 Subject: [PATCH 1/5] Bumped version, explicitly set aws-sdk version, tweaked test. --- package.json | 8 +++++--- test/test-s3-size.js | 12 ++---------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 3288f72..a2cebf6 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,17 @@ { "name": "aws-s3-size", - "version": "0.0.2", + "version": "0.1.0", "description": "Simple module to calculate folder size in S3.", "main": "index.js", "author": "Modulus ", "maintainers": [ - "zwigby " + "Charlie Key ", + "Brandon Cannaday " + ], "repository": "", "dependencies": { - "aws-sdk" : "*" + "aws-sdk" : "2.0.16" }, "repository": { "type": "git", diff --git a/test/test-s3-size.js b/test/test-s3-size.js index 5e4edb6..8e32d59 100644 --- a/test/test-s3-size.js +++ b/test/test-s3-size.js @@ -1,5 +1,5 @@ var S3Sizer = require('../index'); - configFile = __dirname + '/awscreds.json', + configFile = __dirname + '/testcreds.json', s3Sizer = new S3Sizer({configFile : configFile}), expect = require('expect.js'), fs = require('fs'), @@ -11,15 +11,7 @@ describe('S3 Sizer Module', function() { // get test storage size s3Sizer.getFolderSize(config.bucket, config.folder, function(err, size) { expect(err).to.not.be.ok(); - expect(size).to.be(1354482); - done(); - }); - }); - it('should return the 0 is there are no items in folder', function(done) { - // get test storage size - s3Sizer.getFolderSize(config.bucket, config.zeroFolder, function(err, size) { - expect(err).to.not.be.ok(); - expect(size).to.be(0); + expect(size).to.be.greaterThan(0); done(); }); }); From 21a2379bd62310afe072c463b380372aa7e37f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Pa=C5=82ach?= Date: Tue, 5 Apr 2016 19:44:22 +0200 Subject: [PATCH 2/5] possibility to pass s3 instance to constructor --- README.md | 6 +++++- index.js | 28 ++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b63eeab..02b7ab8 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,8 @@ Example Usage s3Sizer.getFolderSize('bucket.name', 'foldername', function(err, size) { console.log(size) - }); \ No newline at end of file + }); +If you already have s3 instance, you can pass it in parameter: + + var s3 = new AWS.S3(); + s3Sizer = new S3Sizer({"s3": s3}); diff --git a/index.js b/index.js index 7604de1..557548f 100644 --- a/index.js +++ b/index.js @@ -9,21 +9,25 @@ var AWS = require('aws-sdk'); * accessKeyId is included then secretAccessKey must also be included. * @config {string} [params.region] The AWS region to make calls against. */ -var S3Sizer = function(params) { - if(params.hasOwnProperty('configFile')) { - AWS.config.loadFromPath(params.configFile); - } + var S3Sizer = function(params) { + if(params.hasOwnProperty('s3')) { + this.s3 = params.s3; + } else{ + if(params.hasOwnProperty('configFile')) { + AWS.config.loadFromPath(params.configFile); + } - if(params.hasOwnProperty('accessKeyId') && params.hasOwnProperty('secretAccessKey')) { - AWS.config.update({accessKeyId : params.accessKeyId, secretAccessKey : params.secretAccessKey}); - } + if(params.hasOwnProperty('accessKeyId') && params.hasOwnProperty('secretAccessKey')) { + AWS.config.update({accessKeyId : params.accessKeyId, secretAccessKey : params.secretAccessKey}); + } - if(params.hasOwnProperty('region')) { - AWS.config.update({region : params.region}); - } + if(params.hasOwnProperty('region')) { + AWS.config.update({region : params.region}); + } - this.s3 = new AWS.S3(); -}; + this.s3 = new AWS.S3(); + } + }; /** * Gets the combined file size of all the objects in a S3 folder. From bd8c5537962945f42d2458d338a1238a72897e41 Mon Sep 17 00:00:00 2001 From: "Tara Z. Manicsic" Date: Fri, 15 Apr 2016 16:34:27 -0400 Subject: [PATCH 3/5] Update version to 0.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2cebf6..998abe2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aws-s3-size", - "version": "0.1.0", + "version": "0.2.0", "description": "Simple module to calculate folder size in S3.", "main": "index.js", "author": "Modulus ", From 4ade8d22d5c826c9f522019cb19bcd9c66564cba Mon Sep 17 00:00:00 2001 From: Jordy van Kuijk Date: Thu, 21 Jul 2022 11:24:12 +0200 Subject: [PATCH 4/5] Bumped dependencies --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 998abe2..fc84a62 100644 --- a/package.json +++ b/package.json @@ -9,17 +9,16 @@ "Brandon Cannaday " ], - "repository": "", "dependencies": { - "aws-sdk" : "2.0.16" + "aws-sdk" : "2.1179.0" }, "repository": { "type": "git", "url": "https://github.com/onmodulus/aws-s3-size" }, "devDependencies" : { - "mocha" : "1.7.x", - "expect.js" : "0.2.x" + "mocha" : "10.0.x", + "expect.js" : "0.3.x" }, "keywords": [ "aws", From 5cbccd42ffbccf03b75ee3d0fe596d2108b1676e Mon Sep 17 00:00:00 2001 From: Jordy van Kuijk Date: Thu, 21 Jul 2022 11:24:40 +0200 Subject: [PATCH 5/5] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc84a62..048a3d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aws-s3-size", - "version": "0.2.0", + "version": "0.2.1", "description": "Simple module to calculate folder size in S3.", "main": "index.js", "author": "Modulus ",