Skip to content

Add test functionName pattern #263

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
May 5, 2017
Merged

Add test functionName pattern #263

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
25d5c65
escape disallowed characters
seoker May 4, 2017
fa3902d
Merge remote-tracking branch 'seoker/escape_function_name' into add_t…
abetomo May 5, 2017
02a01cb
Add `FunctionName` test of unacceptable value in AWS
abetomo May 5, 2017
5de7504
Add test of whether `FunctionName` is pattern allowed by AWS
abetomo May 5, 2017
0ea9822
Modify comment's position
abetomo May 5, 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
11 changes: 7 additions & 4 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ Lambda.prototype._runHandler = function (handler, event, program, context) {

Lambda.prototype._params = function (program, buffer) {
var params = {
FunctionName: program.functionName + (program.environment ? '-' + program.environment : ''),
FunctionName: program.functionName
+ (program.environment ? '-' + program.environment : '')
+ (program.lambdaVersion ? '-' + program.lambdaVersion : ''),
Code: {
ZipFile: buffer
},
Expand All @@ -117,9 +119,10 @@ Lambda.prototype._params = function (program, buffer) {
Mode: null
}
};
if (program.lambdaVersion) {
params.FunctionName += ('-' + program.lambdaVersion);
}

// Escape characters that is not allowed by AWS Lambda
params.FunctionName = params.FunctionName.replace(/[^a-zA-Z0-9-_]/g, '_');

if (program.vpcSubnets && program.vpcSecurityGroups) {
params.VpcConfig = {
'SubnetIds': program.vpcSubnets.split(','),
Expand Down
13 changes: 13 additions & 0 deletions test/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,34 @@ describe('node-lambda', function () {
});

describe('_params', function () {
// http://docs.aws.amazon.com/lambda/latest/dg/API_CreateFunction.html#SSS-CreateFunction-request-FunctionName
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);
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);
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);
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);
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() {
Expand Down