From 5f04ac93e99a11e46d48f3632663ccacb19f80ee Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 9 Jun 2017 17:25:37 +0900 Subject: [PATCH 1/7] Remove comma --- bin/node-lambda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/node-lambda b/bin/node-lambda index c864965f..dd0ad76e 100755 --- a/bin/node-lambda +++ b/bin/node-lambda @@ -11,7 +11,7 @@ const commandTypes = [ 'zip', 'run', 'execute', - 'setup', + 'setup' ]; if (commandTypes.indexOf(process.argv[2]) == -1) { console.log( From a99109f8bb8269ddaafdb433806ac8bfe868cc80 Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 9 Jun 2017 17:26:29 +0900 Subject: [PATCH 2/7] Modify from == to === --- bin/node-lambda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/node-lambda b/bin/node-lambda index dd0ad76e..c5791ec0 100755 --- a/bin/node-lambda +++ b/bin/node-lambda @@ -13,7 +13,7 @@ const commandTypes = [ 'execute', 'setup' ]; -if (commandTypes.indexOf(process.argv[2]) == -1) { +if (commandTypes.indexOf(process.argv[2]) === -1) { console.log( ` Usage: node-lambda [options] [command] From 673700f69e410753b0dc2a7c1bc34959f3d26737 Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 9 Jun 2017 17:29:07 +0900 Subject: [PATCH 3/7] Move '?' to the beginning --- bin/node-lambda | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/node-lambda b/bin/node-lambda index c5791ec0..51d3127a 100755 --- a/bin/node-lambda +++ b/bin/node-lambda @@ -39,8 +39,8 @@ var dotenv = require('dotenv'); var lambda = require(path.join(__dirname, '..', 'lib', 'main.js')); var program = require('commander'); var fs = require('fs'); -var packageJson = fs.existsSync(path.join(process.cwd(), 'package.json')) ? - require(path.join(process.cwd(), 'package.json')) : {}; +var packageJson = fs.existsSync(path.join(process.cwd(), 'package.json')) + ? require(path.join(process.cwd(), 'package.json')) : {}; var packageJsonName = packageJson.name || 'UnnamedFunction'; dotenv.load(); From 03a0dbf8c706652e0f9eff3e88b1238979a05ccc Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 9 Jun 2017 17:30:18 +0900 Subject: [PATCH 4/7] Add { and } --- bin/node-lambda | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/node-lambda b/bin/node-lambda index 51d3127a..8466f2e9 100755 --- a/bin/node-lambda +++ b/bin/node-lambda @@ -78,8 +78,9 @@ var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || ''; var AWS_DLQ_TARGET_ARN = (function() { // You can clear the setting by passing an empty string // when executing updateFunctionConfiguration - if (process.env.AWS_DLQ_TARGET_ARN !== undefined) + if (process.env.AWS_DLQ_TARGET_ARN !== undefined) { return process.env.AWS_DLQ_TARGET_ARN + } return undefined; })(); From fdc3226b22ccb5e84e5f517223fe0cc0fff5f525 Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 9 Jun 2017 17:31:49 +0900 Subject: [PATCH 5/7] Add space --- bin/node-lambda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/node-lambda b/bin/node-lambda index 8466f2e9..9ec905e4 100755 --- a/bin/node-lambda +++ b/bin/node-lambda @@ -75,7 +75,7 @@ var SRC_DIRECTORY = process.env.SRC_DIRECTORY || ''; var DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000; var DOCKER_IMAGE = process.env.DOCKER_IMAGE || ''; var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || ''; -var AWS_DLQ_TARGET_ARN = (function() { +var AWS_DLQ_TARGET_ARN = (function () { // You can clear the setting by passing an empty string // when executing updateFunctionConfiguration if (process.env.AWS_DLQ_TARGET_ARN !== undefined) { From adc17910207cc4dda0983d81a724fe03db0cbbd6 Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 9 Jun 2017 17:31:59 +0900 Subject: [PATCH 6/7] Remove semicolon --- bin/node-lambda | 106 ++++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/bin/node-lambda b/bin/node-lambda index 9ec905e4..3697b5ea 100755 --- a/bin/node-lambda +++ b/bin/node-lambda @@ -1,6 +1,6 @@ #!/usr/bin/env node -'use strict'; +'use strict' // Temporary correspondence in case usage is not displayed correctly // due to `commander` bug. @@ -12,7 +12,7 @@ const commandTypes = [ 'run', 'execute', 'setup' -]; +] if (commandTypes.indexOf(process.argv[2]) === -1) { console.log( ` @@ -30,59 +30,59 @@ if (commandTypes.indexOf(process.argv[2]) === -1) { -h, --help output usage information ` - ); - process.exit(1); + ) + process.exit(1) } -var path = require('path'); -var dotenv = require('dotenv'); -var lambda = require(path.join(__dirname, '..', 'lib', 'main.js')); -var program = require('commander'); -var fs = require('fs'); +var path = require('path') +var dotenv = require('dotenv') +var lambda = require(path.join(__dirname, '..', 'lib', 'main.js')) +var program = require('commander') +var fs = require('fs') var packageJson = fs.existsSync(path.join(process.cwd(), 'package.json')) - ? require(path.join(process.cwd(), 'package.json')) : {}; -var packageJsonName = packageJson.name || 'UnnamedFunction'; + ? require(path.join(process.cwd(), 'package.json')) : {} +var packageJsonName = packageJson.name || 'UnnamedFunction' -dotenv.load(); +dotenv.load() -var AWS_ENVIRONMENT = process.env.AWS_ENVIRONMENT || ''; -var CONFIG_FILE = process.env.CONFIG_FILE || ''; -var EVENT_SOURCE_FILE = process.env.EVENT_SOURCE_FILE || ''; -var EXCLUDE_GLOBS = process.env.EXCLUDE_GLOBS || ''; -var AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID; -var AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY; -var AWS_PROFILE = process.env.AWS_PROFILE || ''; -var AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN || ''; -var AWS_REGION = process.env.AWS_REGION || 'us-east-1,us-west-2,eu-west-1'; -var AWS_FUNCTION_NAME = process.env.AWS_FUNCTION_NAME || packageJsonName; -var AWS_HANDLER = process.env.AWS_HANDLER || 'index.handler'; -var AWS_ROLE = process.env.AWS_ROLE_ARN || process.env.AWS_ROLE || 'missing'; -var AWS_MEMORY_SIZE = process.env.AWS_MEMORY_SIZE || 128; -var AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60; -var AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3; -var AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || ''; -var AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs6.10'; -var AWS_PUBLISH = process.env.AWS_PUBLISH || false; -var AWS_FUNCTION_VERSION = process.env.AWS_FUNCTION_VERSION || ''; -var AWS_VPC_SUBNETS = process.env.AWS_VPC_SUBNETS || ''; -var AWS_VPC_SECURITY_GROUPS = process.env.AWS_VPC_SECURITY_GROUPS || ''; -var AWS_TRACING_CONFIG = process.env.AWS_TRACING_CONFIG || ''; -var EVENT_FILE = process.env.EVENT_FILE || 'event.json'; -var PACKAGE_DIRECTORY = process.env.PACKAGE_DIRECTORY; -var CONTEXT_FILE = process.env.CONTEXT_FILE || 'context.json'; -var PREBUILT_DIRECTORY = process.env.PREBUILT_DIRECTORY || ''; -var SRC_DIRECTORY = process.env.SRC_DIRECTORY || ''; -var DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000; -var DOCKER_IMAGE = process.env.DOCKER_IMAGE || ''; -var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || ''; +var AWS_ENVIRONMENT = process.env.AWS_ENVIRONMENT || '' +var CONFIG_FILE = process.env.CONFIG_FILE || '' +var EVENT_SOURCE_FILE = process.env.EVENT_SOURCE_FILE || '' +var EXCLUDE_GLOBS = process.env.EXCLUDE_GLOBS || '' +var AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID +var AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY +var AWS_PROFILE = process.env.AWS_PROFILE || '' +var AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN || '' +var AWS_REGION = process.env.AWS_REGION || 'us-east-1,us-west-2,eu-west-1' +var AWS_FUNCTION_NAME = process.env.AWS_FUNCTION_NAME || packageJsonName +var AWS_HANDLER = process.env.AWS_HANDLER || 'index.handler' +var AWS_ROLE = process.env.AWS_ROLE_ARN || process.env.AWS_ROLE || 'missing' +var AWS_MEMORY_SIZE = process.env.AWS_MEMORY_SIZE || 128 +var AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60 +var AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3 +var AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || '' +var AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs6.10' +var AWS_PUBLISH = process.env.AWS_PUBLISH || false +var AWS_FUNCTION_VERSION = process.env.AWS_FUNCTION_VERSION || '' +var AWS_VPC_SUBNETS = process.env.AWS_VPC_SUBNETS || '' +var AWS_VPC_SECURITY_GROUPS = process.env.AWS_VPC_SECURITY_GROUPS || '' +var AWS_TRACING_CONFIG = process.env.AWS_TRACING_CONFIG || '' +var EVENT_FILE = process.env.EVENT_FILE || 'event.json' +var PACKAGE_DIRECTORY = process.env.PACKAGE_DIRECTORY +var CONTEXT_FILE = process.env.CONTEXT_FILE || 'context.json' +var PREBUILT_DIRECTORY = process.env.PREBUILT_DIRECTORY || '' +var SRC_DIRECTORY = process.env.SRC_DIRECTORY || '' +var DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000 +var DOCKER_IMAGE = process.env.DOCKER_IMAGE || '' +var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || '' var AWS_DLQ_TARGET_ARN = (function () { // You can clear the setting by passing an empty string // when executing updateFunctionConfiguration if (process.env.AWS_DLQ_TARGET_ARN !== undefined) { return process.env.AWS_DLQ_TARGET_ARN } - return undefined; -})(); + return undefined +})() program .command('deploy') @@ -124,8 +124,8 @@ program .option('-T, --deployTimeout [' + DEPLOY_TIMEOUT + ']', 'Deploy Timeout', DEPLOY_TIMEOUT) .option('-z, --deployZipfile [' + DEPLOY_ZIPFILE + ']', 'Deploy zipfile', DEPLOY_ZIPFILE) .action(function (prg) { - lambda.deploy(prg); - }); + lambda.deploy(prg) + }) program .command('package') @@ -143,8 +143,8 @@ program 'Path to file holding secret environment variables (e.g. "deploy.env")', CONFIG_FILE) .option('-D, --prebuiltDirectory [' + PREBUILT_DIRECTORY + ']', 'Prebuilt directory', PREBUILT_DIRECTORY) .action(function (prg) { - lambda.package(prg); - }); + lambda.package(prg) + }) program .command('run') @@ -158,8 +158,8 @@ program 'Path to file holding secret environment variables (e.g. "deploy.env")', CONFIG_FILE) .option('-x, --contextFile [' + CONTEXT_FILE + ']', 'Context JSON File', CONTEXT_FILE) .action(function (prg) { - lambda.run(prg); - }); + lambda.run(prg) + }) program .command('setup') @@ -167,7 +167,7 @@ program .option('-j, --eventFile [' + EVENT_FILE + ']', 'Event JSON File', EVENT_FILE) .option('-x, --contextFile [' + CONTEXT_FILE + ']', 'Context JSON File', CONTEXT_FILE) .action(function (prg) { - lambda.setup(prg); - }); + lambda.setup(prg) + }) -program.parse(process.argv); +program.parse(process.argv) From c62daf7d56431fa78f52e218c223ca5fddc12073 Mon Sep 17 00:00:00 2001 From: abetomo Date: Fri, 9 Jun 2017 17:32:36 +0900 Subject: [PATCH 7/7] Add `standard bin/node-lambda` with `npm test` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ca05fd0..66c613f4 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "test": "test" }, "scripts": { - "test": "standard && mocha" + "test": "standard && standard bin/node-lambda && mocha" }, "bin": { "node-lambda": "./bin/node-lambda"