move base mappings handling into api gateway deployment block

Author: Aleksander Dikanski

lib/stackInformation.js

@@ -172,7 +172,7 @@ module.exports = {
 		)
 		.spread((currentTemplate, aliasStackTemplates) => {
 			const currentAliasStackTemplate = _.get(_.first(aliasStackTemplates, 'template', {}));
-			const deployedAliasStackTemplates = _.map(filteredAliasStackTemplates, template => template.template);
+			const deployedAliasStackTemplates = _.map(aliasStackTemplates, template => template.template);
 
 			this._serverless.service.provider.deployedCloudFormationTemplate = currentTemplate;
 			this._serverless.service.provider.deployedCloudFormationAliasTemplate = currentAliasStackTemplate;

lib/stackops/apiGateway.js

@@ -186,19 +186,19 @@ module.exports = function(currentTemplate, aliasStackTemplates, currentAliasStac
 			this.options.verbose && this._serverless.cli.log('Configuring stage');
 			const stageResource = internal.createStageResource.call(this, `${stackName}-ApiGatewayRestApi`, deploymentName);
 			aliasResources.push({ ApiGatewayStage: stageResource });
-		}
-
-		const baseMapping = _.assign({}, _.pickBy(stageStack.Resources, ['Type', 'AWS::ApiGateway::BasePathMapping']));
-		if (!_.isEmpty(baseMapping)) {
-			const baseMappingName = _.keys(baseMapping)[0];
-			const obj = baseMapping[baseMappingName];
+			
+			const baseMapping = _.assign({}, _.pickBy(stageStack.Resources, ['Type', 'AWS::ApiGateway::BasePathMapping']));
+			if (!_.isEmpty(baseMapping)) {
+				const baseMappingName = _.keys(baseMapping)[0];
+				const obj = baseMapping[baseMappingName];
 
-			delete obj.Properties.StageName;
-			obj.Properties.RestApiId = { 'Fn::ImportValue': `${stackName}-ApiGatewayRestApi`};
+				obj.Properties.StageName = { Ref: 'ApiGatewayStage' };
+				obj.Properties.RestApiId = { 'Fn::ImportValue': `${stackName}-ApiGatewayRestApi`};
 
-			aliasResources.push(baseMapping);
-			delete stageStack.Resources[baseMappingName];
-		}
+				aliasResources.push(baseMapping);
+				delete stageStack.Resources[baseMappingName];
+			}
+		}	
 
 		// Fetch lambda permissions, methods and resources. These have to be updated later to allow the aliased functions.
 		const apiLambdaPermissions =

test/stackops/apiGateway.test.js

@@ -749,6 +749,7 @@ describe('API Gateway', () => {
 									BasePath: '(none)',
 									DomainName: 'example.com',
 									RestApiId: { 'Fn::ImportValue': 'testService-myStage-ApiGatewayRestApi' },
+									StageName: { Ref: 'ApiGatewayStage' },
 									Stage: 'test'
 								}
 							})