Skip to content

Commit 9bc3b74

Browse files
abetomoDeviaVir
abetomo
authored and
DeviaVir
committed
Fix to make bin/node-lambda conform to JavaScript Standard Style (motdotla#315)
* Remove comma * Modify from == to === * Move '?' to the beginning * Add { and } * Add space * Remove semicolon * Add `standard bin/node-lambda` with `npm test`
1 parent a42f780 commit 9bc3b74

2 files changed

Lines changed: 60 additions & 59 deletions

File tree

‎bin/node-lambda‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22

3-
'use strict';
3+
'use strict'
44

55
// Temporary correspondence in case usage is not displayed correctly
66
// due to `commander` bug.
@@ -11,9 +11,9 @@ const commandTypes = [
1111
'zip',
1212
'run',
1313
'execute',
14-
'setup',
15-
];
16-
if (commandTypes.indexOf(process.argv[2]) == -1) {
14+
'setup'
15+
]
16+
if (commandTypes.indexOf(process.argv[2]) === -1) {
1717
console.log(
1818
`
1919
Usage: node-lambda [options] [command]
@@ -30,58 +30,59 @@ if (commandTypes.indexOf(process.argv[2]) == -1) {
3030
3131
-h, --help output usage information
3232
`
33-
);
34-
process.exit(1);
33+
)
34+
process.exit(1)
3535
}
3636

37-
var path = require('path');
38-
var dotenv = require('dotenv');
39-
var lambda = require(path.join(__dirname, '..', 'lib', 'main.js'));
40-
var program = require('commander');
41-
var fs = require('fs');
42-
var packageJson = fs.existsSync(path.join(process.cwd(), 'package.json')) ?
43-
require(path.join(process.cwd(), 'package.json')) : {};
44-
var packageJsonName = packageJson.name || 'UnnamedFunction';
37+
var path = require('path')
38+
var dotenv = require('dotenv')
39+
var lambda = require(path.join(__dirname, '..', 'lib', 'main.js'))
40+
var program = require('commander')
41+
var fs = require('fs')
42+
var packageJson = fs.existsSync(path.join(process.cwd(), 'package.json'))
43+
? require(path.join(process.cwd(), 'package.json')) : {}
44+
var packageJsonName = packageJson.name || 'UnnamedFunction'
4545

46-
dotenv.load();
46+
dotenv.load()
4747

48-
var AWS_ENVIRONMENT = process.env.AWS_ENVIRONMENT || '';
49-
var CONFIG_FILE = process.env.CONFIG_FILE || '';
50-
var EVENT_SOURCE_FILE = process.env.EVENT_SOURCE_FILE || '';
51-
var EXCLUDE_GLOBS = process.env.EXCLUDE_GLOBS || '';
52-
var AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
53-
var AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
54-
var AWS_PROFILE = process.env.AWS_PROFILE || '';
55-
var AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN || '';
56-
var AWS_REGION = process.env.AWS_REGION || 'us-east-1,us-west-2,eu-west-1';
57-
var AWS_FUNCTION_NAME = process.env.AWS_FUNCTION_NAME || packageJsonName;
58-
var AWS_HANDLER = process.env.AWS_HANDLER || 'index.handler';
59-
var AWS_ROLE = process.env.AWS_ROLE_ARN || process.env.AWS_ROLE || 'missing';
60-
var AWS_MEMORY_SIZE = process.env.AWS_MEMORY_SIZE || 128;
61-
var AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60;
62-
var AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3;
63-
var AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || '';
64-
var AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs6.10';
65-
var AWS_PUBLISH = process.env.AWS_PUBLISH || false;
66-
var AWS_FUNCTION_VERSION = process.env.AWS_FUNCTION_VERSION || '';
67-
var AWS_VPC_SUBNETS = process.env.AWS_VPC_SUBNETS || '';
68-
var AWS_VPC_SECURITY_GROUPS = process.env.AWS_VPC_SECURITY_GROUPS || '';
69-
var AWS_TRACING_CONFIG = process.env.AWS_TRACING_CONFIG || '';
70-
var EVENT_FILE = process.env.EVENT_FILE || 'event.json';
71-
var PACKAGE_DIRECTORY = process.env.PACKAGE_DIRECTORY;
72-
var CONTEXT_FILE = process.env.CONTEXT_FILE || 'context.json';
73-
var PREBUILT_DIRECTORY = process.env.PREBUILT_DIRECTORY || '';
74-
var SRC_DIRECTORY = process.env.SRC_DIRECTORY || '';
75-
var DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000;
76-
var DOCKER_IMAGE = process.env.DOCKER_IMAGE || '';
77-
var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || '';
78-
var AWS_DLQ_TARGET_ARN = (function() {
48+
var AWS_ENVIRONMENT = process.env.AWS_ENVIRONMENT || ''
49+
var CONFIG_FILE = process.env.CONFIG_FILE || ''
50+
var EVENT_SOURCE_FILE = process.env.EVENT_SOURCE_FILE || ''
51+
var EXCLUDE_GLOBS = process.env.EXCLUDE_GLOBS || ''
52+
var AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID
53+
var AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY
54+
var AWS_PROFILE = process.env.AWS_PROFILE || ''
55+
var AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN || ''
56+
var AWS_REGION = process.env.AWS_REGION || 'us-east-1,us-west-2,eu-west-1'
57+
var AWS_FUNCTION_NAME = process.env.AWS_FUNCTION_NAME || packageJsonName
58+
var AWS_HANDLER = process.env.AWS_HANDLER || 'index.handler'
59+
var AWS_ROLE = process.env.AWS_ROLE_ARN || process.env.AWS_ROLE || 'missing'
60+
var AWS_MEMORY_SIZE = process.env.AWS_MEMORY_SIZE || 128
61+
var AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60
62+
var AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3
63+
var AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || ''
64+
var AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs6.10'
65+
var AWS_PUBLISH = process.env.AWS_PUBLISH || false
66+
var AWS_FUNCTION_VERSION = process.env.AWS_FUNCTION_VERSION || ''
67+
var AWS_VPC_SUBNETS = process.env.AWS_VPC_SUBNETS || ''
68+
var AWS_VPC_SECURITY_GROUPS = process.env.AWS_VPC_SECURITY_GROUPS || ''
69+
var AWS_TRACING_CONFIG = process.env.AWS_TRACING_CONFIG || ''
70+
var EVENT_FILE = process.env.EVENT_FILE || 'event.json'
71+
var PACKAGE_DIRECTORY = process.env.PACKAGE_DIRECTORY
72+
var CONTEXT_FILE = process.env.CONTEXT_FILE || 'context.json'
73+
var PREBUILT_DIRECTORY = process.env.PREBUILT_DIRECTORY || ''
74+
var SRC_DIRECTORY = process.env.SRC_DIRECTORY || ''
75+
var DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000
76+
var DOCKER_IMAGE = process.env.DOCKER_IMAGE || ''
77+
var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || ''
78+
var AWS_DLQ_TARGET_ARN = (function () {
7979
// You can clear the setting by passing an empty string
8080
// when executing updateFunctionConfiguration
81-
if (process.env.AWS_DLQ_TARGET_ARN !== undefined)
81+
if (process.env.AWS_DLQ_TARGET_ARN !== undefined) {
8282
return process.env.AWS_DLQ_TARGET_ARN
83-
return undefined;
84-
})();
83+
}
84+
return undefined
85+
})()
8586

8687
program
8788
.command('deploy')
@@ -123,8 +124,8 @@ program
123124
.option('-T, --deployTimeout [' + DEPLOY_TIMEOUT + ']', 'Deploy Timeout', DEPLOY_TIMEOUT)
124125
.option('-z, --deployZipfile [' + DEPLOY_ZIPFILE + ']', 'Deploy zipfile', DEPLOY_ZIPFILE)
125126
.action(function (prg) {
126-
lambda.deploy(prg);
127-
});
127+
lambda.deploy(prg)
128+
})
128129

129130
program
130131
.command('package')
@@ -142,8 +143,8 @@ program
142143
'Path to file holding secret environment variables (e.g. "deploy.env")', CONFIG_FILE)
143144
.option('-D, --prebuiltDirectory [' + PREBUILT_DIRECTORY + ']', 'Prebuilt directory', PREBUILT_DIRECTORY)
144145
.action(function (prg) {
145-
lambda.package(prg);
146-
});
146+
lambda.package(prg)
147+
})
147148

148149
program
149150
.command('run')
@@ -157,16 +158,16 @@ program
157158
'Path to file holding secret environment variables (e.g. "deploy.env")', CONFIG_FILE)
158159
.option('-x, --contextFile [' + CONTEXT_FILE + ']', 'Context JSON File', CONTEXT_FILE)
159160
.action(function (prg) {
160-
lambda.run(prg);
161-
});
161+
lambda.run(prg)
162+
})
162163

163164
program
164165
.command('setup')
165166
.description('Sets up the .env file.')
166167
.option('-j, --eventFile [' + EVENT_FILE + ']', 'Event JSON File', EVENT_FILE)
167168
.option('-x, --contextFile [' + CONTEXT_FILE + ']', 'Context JSON File', CONTEXT_FILE)
168169
.action(function (prg) {
169-
lambda.setup(prg);
170-
});
170+
lambda.setup(prg)
171+
})
171172

172-
program.parse(process.argv);
173+
program.parse(process.argv)

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "test"
88
},
99
"scripts": {
10-
"test": "standard && mocha"
10+
"test": "standard && standard bin/node-lambda && mocha"
1111
},
1212
"bin": {
1313
"node-lambda": "./bin/node-lambda"

0 commit comments

Comments
 (0)