Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Fix default value of params.Environment.Variables is null
If `{}` is set, it will be set as empty.
If you want to empty, you can specify an empty file in `configFile`
  • Loading branch information
abetomo committed Apr 7, 2017
commit b3114c8c30c1b3274adc898f414f98f42cd58937
3 changes: 2 additions & 1 deletion lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Lambda.prototype._params = function (program, buffer) {
SecurityGroupIds: []
},
Environment: {
Variables: {}
Variables: null
},
DeadLetterConfig: {
TargetArn: null
Expand All @@ -129,6 +129,7 @@ Lambda.prototype._params = function (program, buffer) {
if (program.configFile) {
var configValues = fs.readFileSync(program.configFile);
var config = dotenv.parse(configValues);
// If `configFile` is an empty file, `config` value will be `{}`
params.Environment = {
Variables: config
}
Expand Down
10 changes: 9 additions & 1 deletion test/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,12 @@ describe('node-lambda', function () {
beforeEach(function () {
// Prep...
fs.writeFileSync('tmp.env', 'FOO=bar\nBAZ=bing\n');
fs.writeFileSync('empty.env', '');
});

afterEach(function () {
fs.unlinkSync('tmp.env');
fs.unlinkSync('empty.env');
});

it('adds variables when configFile param is set', function () {
Expand All @@ -108,10 +110,16 @@ describe('node-lambda', function () {
assert.equal(params.Environment.Variables['BAZ'], "bing");
});

it('does not add when configFile param is not set', function () {
it('when configFile param is set but it is an empty file', function () {
program.configFile = 'empty.env';
var 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);
assert.isNull(params.Environment.Variables);
});
});
});

Expand Down