From 007047b9586a7fbd60338b9bab44fcbcebee9b41 Mon Sep 17 00:00:00 2001 From: abetomo Date: Mon, 8 May 2017 16:24:33 +0900 Subject: [PATCH 1/4] Delete unnecessary variables from `_codeDirectory` Also added tests --- lib/main.js | 4 +--- test/main.js | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/main.js b/lib/main.js index 5464be8f..1364d41e 100644 --- a/lib/main.js +++ b/lib/main.js @@ -367,9 +367,7 @@ Lambda.prototype._nativeZip = function (program, codeDirectory, callback) { }); }; -Lambda.prototype._codeDirectory = function (program) { - var epoch_time = +new Date(); - +Lambda.prototype._codeDirectory = function () { return path.resolve('.', '.lambda'); }; diff --git a/test/main.js b/test/main.js index 586bd27c..9dadebcd 100644 --- a/test/main.js +++ b/test/main.js @@ -64,6 +64,13 @@ describe('node-lambda', function () { assert.equal(lambda.version, '0.9.0'); }); + describe('_codeDirectory', function () { + it('.lambda in the current directory', function () { + assert.equal(lambda._codeDirectory(), path.resolve('.', '.lambda')); + assert.equal(lambda._codeDirectory(program), path.resolve('.', '.lambda')); + }); + }); + describe('_params', function () { // http://docs.aws.amazon.com/lambda/latest/dg/API_CreateFunction.html#SSS-CreateFunction-request-FunctionName const functionNamePattern = From 345db5936b014bb7f81d3d05848857a7ec5dea31 Mon Sep 17 00:00:00 2001 From: abetomo Date: Mon, 8 May 2017 16:26:34 +0900 Subject: [PATCH 2/4] Fix to unify variable to camel case --- lib/main.js | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/main.js b/lib/main.js index 1364d41e..bdd7cbf9 100644 --- a/lib/main.js +++ b/lib/main.js @@ -184,8 +184,8 @@ Lambda.prototype._eventSourceList = function (program) { * @deprecated */ Lambda.prototype._zipfileTmpPath = function (program) { - var ms_since_epoch = +new Date(); - var filename = program.functionName + '-' + ms_since_epoch + '.zip'; + var msSinceEpoch = +new Date(); + var filename = program.functionName + '-' + msSinceEpoch + '.zip'; var zipfile = path.join(os.tmpDir(), filename); return zipfile; @@ -434,24 +434,24 @@ Lambda.prototype._uploadNew = function (lambda, params, cb) { }); }; -Lambda.prototype._readArchive = function (program, archive_callback) { +Lambda.prototype._readArchive = function (program, archiveCallback) { if (!fs.existsSync(program.deployZipfile)) { var err = new Error('No such Zipfile [' + program.deployZipfile + ']'); - return archive_callback(err); + return archiveCallback(err); } - fs.readFile(program.deployZipfile, archive_callback); + fs.readFile(program.deployZipfile, archiveCallback); }; -Lambda.prototype._archive = function (program, archive_callback) { +Lambda.prototype._archive = function (program, archiveCallback) { if (program.deployZipfile && fs.existsSync(program.deployZipfile)) { - return this._readArchive(program, archive_callback); + return this._readArchive(program, archiveCallback); } return program.prebuiltDirectory ? - this._archivePrebuilt(program, archive_callback) : - this._buildAndArchive(program, archive_callback); + this._archivePrebuilt(program, archiveCallback) : + this._buildAndArchive(program, archiveCallback); }; -Lambda.prototype._archivePrebuilt = function (program, archive_callback) { +Lambda.prototype._archivePrebuilt = function (program, archiveCallback) { var codeDirectory = this._codeDirectory(program); var _this = this; @@ -465,18 +465,18 @@ Lambda.prototype._archivePrebuilt = function (program, archive_callback) { } this[copyFunction](program, program.prebuiltDirectory, codeDirectory, false, function (err) { if (err) { - return archive_callback(err); + return archiveCallback(err); } console.log('=> Zipping deployment package'); var archive = process.platform !== 'win32' ? _this._nativeZip : _this._zip; archive = archive.bind(_this); - archive(program, codeDirectory, archive_callback); + archive(program, codeDirectory, archiveCallback); }); }; -Lambda.prototype._buildAndArchive = function (program, archive_callback) { +Lambda.prototype._buildAndArchive = function (program, archiveCallback) { this._createSampleFile('.env', '.env'); // Warn if not building on 64-bit linux @@ -492,7 +492,7 @@ Lambda.prototype._buildAndArchive = function (program, archive_callback) { _this._cleanDirectory(codeDirectory, function (err) { if (err) { - return archive_callback(err); + return archiveCallback(err); } console.log('=> Moving files to temporary directory'); @@ -507,17 +507,17 @@ Lambda.prototype._buildAndArchive = function (program, archive_callback) { // Move files to tmp folder _this[copyFunction](program, '.', codeDirectory, true, function (err) { if (err) { - return archive_callback(err); + return archiveCallback(err); } console.log('=> Running npm install --production'); _this._npmInstall(program, codeDirectory, function (err) { if (err) { - return archive_callback(err); + return archiveCallback(err); } _this._postInstallScript(program, codeDirectory, function (err) { if (err) { - return archive_callback(err); + return archiveCallback(err); } console.log('=> Zipping deployment package'); @@ -525,7 +525,7 @@ Lambda.prototype._buildAndArchive = function (program, archive_callback) { var archive = process.platform !== 'win32' ? _this._nativeZip : _this._zip; archive = archive.bind(_this); - archive(program, codeDirectory, archive_callback); + archive(program, codeDirectory, archiveCallback); }); }); }); @@ -695,7 +695,7 @@ Lambda.prototype.deploy = function (program) { console.log('=> Uploading zip file to AWS Lambda ' + region + ' with parameters:'); console.log(params); - var aws_security = { + var awsSecurity = { region: region }; @@ -704,15 +704,15 @@ Lambda.prototype.deploy = function (program) { profile: program.profile }); } else { - aws_security.accessKeyId = program.accessKey; - aws_security.secretAccessKey = program.secretKey; + awsSecurity.accessKeyId = program.accessKey; + awsSecurity.secretAccessKey = program.secretKey; } if (program.sessionToken) { - aws_security.sessionToken = program.sessionToken; + awsSecurity.sessionToken = program.sessionToken; } - aws.config.update(aws_security); + aws.config.update(awsSecurity); var lambda = new aws.Lambda({ apiVersion: '2015-03-31' From 3613aece4faf32e5893134ab094d066754758d9d Mon Sep 17 00:00:00 2001 From: abetomo Date: Mon, 8 May 2017 16:27:21 +0900 Subject: [PATCH 3/4] Remove argument from `_codeDirectory` in test Argument is no longer needed --- test/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/main.js b/test/main.js index 9dadebcd..8604ee7c 100644 --- a/test/main.js +++ b/test/main.js @@ -33,7 +33,7 @@ var originalProgram = { prebuiltDirectory: '', }; -var codeDirectory = lambda._codeDirectory(Hoek.clone(originalProgram)); +var codeDirectory = lambda._codeDirectory(); function _timeout(params) { // Even if timeout is set for the whole test for Windows, From fee8b58ebf07c4575af612a03e04c346b4b45f99 Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 12 May 2017 10:40:34 +0900 Subject: [PATCH 4/4] Remove unnecessary arguments --- lib/main.js | 4 ++-- test/main.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/main.js b/lib/main.js index fb34fba3..61ff9719 100644 --- a/lib/main.js +++ b/lib/main.js @@ -470,7 +470,7 @@ Lambda.prototype._archive = function (program, archiveCallback) { }; Lambda.prototype._archivePrebuilt = function (program, archiveCallback) { - var codeDirectory = this._codeDirectory(program); + var codeDirectory = this._codeDirectory(); var _this = this; // It is switched to `_ rsync` by environment variable. @@ -509,7 +509,7 @@ Lambda.prototype._buildAndArchive = function (program, archiveCallback) { } var _this = this; - var codeDirectory = _this._codeDirectory(program); + var codeDirectory = _this._codeDirectory(); var lambdaSrcDirectory = program.sourceDirectory ? program.sourceDirectory.replace(/\/$/, '') : '.'; _this._cleanDirectory(codeDirectory, function (err) { diff --git a/test/main.js b/test/main.js index 2e27e07f..4faaa8de 100644 --- a/test/main.js +++ b/test/main.js @@ -68,7 +68,6 @@ describe('node-lambda', function () { describe('_codeDirectory', function () { it('.lambda in the current directory', function () { assert.equal(lambda._codeDirectory(), path.resolve('.', '.lambda')); - assert.equal(lambda._codeDirectory(program), path.resolve('.', '.lambda')); }); });