Merge pull request serverless-heaven#81 from HyperBrain/support-any-i…

…n-stage-config Support ANY type endpoints with stage configuration
1stdibs · Nov 22, 2017 · a2a482b · a2a482b
2 parents e0215d2 + 61ad807
commit a2a482b
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /node_modules
 /coverage
+/.nyc_output
diff --git a/lib/stackops/apiGateway.js b/lib/stackops/apiGateway.js
@@ -80,6 +80,16 @@ const internal = {
 				if (!_.isEmpty(eventStageConfig)) {
 					const methodType = _.toUpper(httpEvent.method);
 					const methodSetting = {};
+					const methods = methodType === 'ANY' ? [
+						'DELETE',
+						'GET',
+						'HEAD',
+						'OPTIONS',
+						'PATCH',
+						'POST',
+						'PUT'
+					]: [ methodType ];
+
 					_.forOwn(eventStageConfig, (value, key) => {
 						if (!_.has(stageMethodConfigMappings, key)) {
 							throw new this.serverless.classes.Error(`Invalid stage config '${key}' at method '${methodType} /${httpEvent.path}'`);
@@ -91,9 +101,11 @@ const internal = {
 						}
 					});
 					if (!_.isEmpty(methodSetting)) {
-						methodSetting.HttpMethod = methodType;
 						methodSetting.ResourcePath = '/' + _.replace('/' + _.trimStart(httpEvent.path, '/'), /\//g, '~1');
-						methodSettings.push(methodSetting);
+						_.forEach(methods, method => {
+							methodSetting.HttpMethod = method;
+							methodSettings.push(_.clone(methodSetting));
+						});
 					}
 				}
 			});

diff --git a/test/stackops/apiGateway.test.js b/test/stackops/apiGateway.test.js
@@ -223,6 +223,17 @@ describe('API Gateway', () => {
 							}
 						]
 					},
+					functionC: {
+						handler: 'functionB.handler',
+						events: [
+							{
+								http: {
+									method: 'ANY',
+									path: '/funcC'
+								}
+							},
+						]
+					},
 				}
 			};
 			const expectedMethodSettings = [
@@ -246,6 +257,41 @@ describe('API Gateway', () => {
 					HttpMethod: 'UPDATE',
 					ResourcePath: '/~1funcB~1update'
 				},
+				{
+					LoggingLevel: 'INFO',
+					HttpMethod: 'DELETE',
+					ResourcePath: '/~1funcC'
+				},
+				{
+					LoggingLevel: 'INFO',
+					HttpMethod: 'GET',
+					ResourcePath: '/~1funcC'
+				},
+				{
+					LoggingLevel: 'INFO',
+					HttpMethod: 'HEAD',
+					ResourcePath: '/~1funcC'
+				},
+				{
+					LoggingLevel: 'INFO',
+					HttpMethod: 'OPTIONS',
+					ResourcePath: '/~1funcC'
+				},
+				{
+					LoggingLevel: 'INFO',
+					HttpMethod: 'PATCH',
+					ResourcePath: '/~1funcC'
+				},
+				{
+					LoggingLevel: 'INFO',
+					HttpMethod: 'POST',
+					ResourcePath: '/~1funcC'
+				},
+				{
+					LoggingLevel: 'INFO',
+					HttpMethod: 'PUT',
+					ResourcePath: '/~1funcC'
+				},
 			];
 
 			awsAlias.serverless.service = new awsAlias.serverless.classes.Service(awsAlias.serverless, service);