Skip to content

Fix to make bin/node-lambda conform to JavaScript Standard Style #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeviaVir merged 7 commits into from
Jun 9, 2017
Merged

Fix to make bin/node-lambda conform to JavaScript Standard Style #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f04ac9
Remove comma
abetomo Jun 9, 2017
a99109f
Modify from == to ===
abetomo Jun 9, 2017
673700f
Move '?' to the beginning
abetomo Jun 9, 2017
03a0dbf
Add { and }
abetomo Jun 9, 2017
fdc3226
Add space
abetomo Jun 9, 2017
adc1791
Remove semicolon
abetomo Jun 9, 2017
c62daf7
Add `standard bin/node-lambda` with `npm test`
abetomo Jun 9, 2017
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
117 changes: 59 additions & 58 deletions bin/node-lambda
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -11,9 +11,9 @@ const commandTypes = [
'zip',
'run',
'execute',
'setup',
];
if (commandTypes.indexOf(process.argv[2]) == -1) {
'setup'
]
if (commandTypes.indexOf(process.argv[2]) === -1) {
console.log(
`
Usage: node-lambda [options] [command]
Expand All @@ -30,58 +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 packageJson = fs.existsSync(path.join(process.cwd(), 'package.json')) ?
require(path.join(process.cwd(), 'package.json')) : {};
var packageJsonName = packageJson.name || 'UnnamedFunction';
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'

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_DLQ_TARGET_ARN = (function() {
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)
if (process.env.AWS_DLQ_TARGET_ARN !== undefined) {
return process.env.AWS_DLQ_TARGET_ARN
return undefined;
})();
}
return undefined
})()

program
.command('deploy')
Expand Down Expand Up @@ -123,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')
Expand All @@ -142,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')
Expand All @@ -157,16 +158,16 @@ 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')
.description('Sets up the .env file.')
.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)
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test": "test"
},
"scripts": {
"test": "standard && mocha"
"test": "standard && standard bin/node-lambda && mocha"
},
"bin": {
"node-lambda": "./bin/node-lambda"
Expand Down