Skip to content

Replace var with const #341

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 5 commits into from
Jul 3, 2017
Merged

Replace var with const #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4ed0fc
Refactoring _listEventSourceMappings
abetomo Jun 28, 2017
58e7f2c
Remove unnecessary catch
abetomo Jun 28, 2017
6753005
Merge branch 'master' into refactoring_listEventSourceMappings
abetomo Jun 29, 2017
42670c2
Replace `var` with `const`
abetomo Jun 29, 2017
740e27b
Merge branch 'master' into replace_var_with_const
abetomo Jun 30, 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
14 changes: 7 additions & 7 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const Lambda = function () {
}

Lambda.prototype._createSampleFile = function (file, boilerplateName) {
var exampleFile = path.join(process.cwd(), file)
var boilerplateFile = path.join(
const exampleFile = path.join(process.cwd(), file)
const boilerplateFile = path.join(
__dirname,
(boilerplateName || file) + '.example'
)
Expand Down Expand Up @@ -150,7 +150,7 @@ so you can easily test run multiple events.
}

Lambda.prototype._params = function (program, buffer) {
var params = {
const params = {
FunctionName: program.functionName +
(program.environment ? '-' + program.environment : '') +
(program.lambdaVersion ? '-' + program.lambdaVersion : ''),
Expand Down Expand Up @@ -189,8 +189,8 @@ Lambda.prototype._params = function (program, buffer) {
}
}
if (program.configFile) {
var configValues = fs.readFileSync(program.configFile)
var config = dotenv.parse(configValues)
const configValues = fs.readFileSync(program.configFile)
const config = dotenv.parse(configValues)
// If `configFile` is an empty file, `config` value will be `{}`
params.Environment = {
Variables: config
Expand Down Expand Up @@ -441,8 +441,8 @@ Lambda.prototype._cleanDirectory = (codeDirectory) => {
}

Lambda.prototype._setRunTimeEnvironmentVars = function (program) {
var configValues = fs.readFileSync(program.configFile)
var config = dotenv.parse(configValues)
const configValues = fs.readFileSync(program.configFile)
const config = dotenv.parse(configValues)

for (let k in config) {
if (!config.hasOwnProperty(k)) {
Expand Down
20 changes: 10 additions & 10 deletions test/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,36 +152,36 @@ describe('lib/main', function () {
const functionNamePattern =
/(arn:aws:lambda:)?([a-z]{2}-[a-z]+-\d{1}:)?(\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\$LATEST|[a-zA-Z0-9-_]+))?/
it('appends environment to original functionName', function () {
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(params.FunctionName, '___node-lambda-development')
assert.match(params.FunctionName, functionNamePattern)
})

it('appends environment to original functionName (production)', function () {
program.environment = 'production'
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(params.FunctionName, '___node-lambda-production')
assert.match(params.FunctionName, functionNamePattern)
})

it('appends version to original functionName', function () {
program.lambdaVersion = '2015-02-01'
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(params.FunctionName, '___node-lambda-development-2015-02-01')
assert.match(params.FunctionName, functionNamePattern)
})

it('appends version to original functionName (value not allowed by AWS)', function () {
program.lambdaVersion = '2015.02.01'
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(params.FunctionName, '___node-lambda-development-2015_02_01')
assert.match(params.FunctionName, functionNamePattern)
})

it('appends VpcConfig to params when vpc params set', function () {
program.vpcSubnets = 'subnet-00000000,subnet-00000001,subnet-00000002'
program.vpcSecurityGroups = 'sg-00000000,sg-00000001,sg-00000002'
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(params.VpcConfig.SubnetIds[0], program.vpcSubnets.split(',')[0])
assert.equal(params.VpcConfig.SubnetIds[1], program.vpcSubnets.split(',')[1])
assert.equal(params.VpcConfig.SubnetIds[2], program.vpcSubnets.split(',')[2])
Expand All @@ -191,7 +191,7 @@ describe('lib/main', function () {
})

it('does not append VpcConfig when params are not set', function () {
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(Object.keys(params.VpcConfig.SubnetIds).length, 0)
assert.equal(Object.keys(params.VpcConfig.SecurityGroupIds).length, 0)
})
Expand All @@ -206,7 +206,7 @@ describe('lib/main', function () {

it('does not append DeadLetterConfig when params are not set', function () {
delete program.deadLetterConfigTargetArn
var params = lambda._params(program)
const params = lambda._params(program)
assert.isNull(params.DeadLetterConfig.TargetArn)
})

Expand Down Expand Up @@ -236,19 +236,19 @@ describe('lib/main', function () {

it('adds variables when configFile param is set', function () {
program.configFile = 'tmp.env'
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(params.Environment.Variables['FOO'], 'bar')
assert.equal(params.Environment.Variables['BAZ'], 'bing')
})

it('when configFile param is set but it is an empty file', function () {
program.configFile = 'empty.env'
var params = lambda._params(program)
const params = lambda._params(program)
assert.equal(Object.keys(params.Environment.Variables).length, 0)
})

it('does not add when configFile param is not set', function () {
var params = lambda._params(program)
const params = lambda._params(program)
assert.isNull(params.Environment.Variables)
})
})
Expand Down