archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-18 14:58:43 +00:00
Code Issues Projects Releases Wiki Activity

Split validation: check underscore always and check hyphen only if http events are present.

Browse Source
This commit is contained in:
exoego 2018-12-31 21:50:49 +09:00
parent e694cd1abf
commit 85238c4331
2 changed files with 55 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/plugins/aws/provider/awsProvider.js
View File

@ -19,7 +19,8 @@ const constants = {
providerName: 'aws',
};
const validStageNamePattern = /^[a-zA-Z0-9]+$/;
const validCloudFrontStageNamePattern = /^[a-zA-Z0-9-]+$/;
const validAPIGatewayStageNamePattern = /^[a-zA-Z0-9_]+$/;
PromiseQueue.configure(BbPromise.Promise);
@ -203,14 +204,24 @@ class AwsProvider {
}
const stage = this.getStage();
if (!validStageNamePattern.test(stage)) {
if (!validCloudFrontStageNamePattern.test(stage)) {
throw new Error([
`Invalid stage name ${stage}: `,
'it should contains only [a-zA-Z0-9] for AWS provider ',
'since API Gateway stage name cannot contain hyphens ',
'and CloudFront stack name cannot contain underscores.',
'it should contains only [a-zA-Z0-9] and hyphens for AWS provider.',
].join(''));
}
this.serverless.service.getAllFunctions().forEach(funcName => {
_.forEach(this.serverless.service.getAllEventsInFunction(funcName), event => {
if (_.has(event, 'http') && !validAPIGatewayStageNamePattern.test(stage)) {
throw new Error([
`Invalid stage name ${stage}: `,
'it should contains only [a-zA-Z0-9] for AWS provider if http event are present ',
'since API Gateway stage name cannot contains hyphens.',
].join(''));
}
});
});
}
/**

48
lib/plugins/aws/provider/awsProvider.test.js
View File

@ -91,7 +91,7 @@ describe('AwsProvider', () => {
});
describe('validation on construction', () => {
it('should not throw if stage name contains only alphanumeric', () => {
it('should not throw an error if stage name contains only alphanumeric', () => {
const config = {
stage: 'configStage',
};
@ -99,14 +99,6 @@ describe('AwsProvider', () => {
expect(() => new AwsProvider(serverless, config)).to.not.throw(Error);
});
it('should throw an error if stage name contains hyphen', () => {
const config = {
stage: 'config-stage',
};
serverless = new Serverless(config);
expect(() => new AwsProvider(serverless, config)).to.throw(Error);
});
it('should throw an error if stage name contains underscore', () => {
const config = {
stage: 'config_stage',
@ -123,6 +115,44 @@ describe('AwsProvider', () => {
serverless = new Serverless(config);
expect(() => new AwsProvider(serverless, config)).to.throw(Error);
});
it('should not throw an error if stage contains hyphen but http events are absent', () => {
const config = {
stage: 'config-stage',
};
serverless = new Serverless(config);
expect(() => new AwsProvider(serverless, config)).to.not.throw(Error);
});
it('should throw an error if stage contains hyphen and http events are present', () => {
const config = {
stage: 'config-stage',
};
serverless = new Serverless(config);
const serverlessYml = {
service: 'new-service',
provider: {
name: 'aws',
stage: 'config-stage',
},
functions: {
first: {
events: [
{
http: {
path: 'foo',
method: 'GET',
},
},
],
},
},
};
serverless.service = new serverless.classes.Service(serverless, serverlessYml);
expect(() => new AwsProvider(serverless, config)).to.throw(Error);
});
});
describe('certificate authority - environment variable', () => {