Merge cd7febc into 6b9d0ac

index.js

@@ -165,6 +165,7 @@ class AwsAlias {
 
 			'alias:remove:remove': () => BbPromise.bind(this)
 				.then(this.validate)
+				.then(this.setBucketName)
 				.then(this.aliasStackLoadCurrentCFStackAndDependencies)
 				.spread(this.removeAlias)
 		};

lib/removeAlias.js

@@ -5,6 +5,7 @@ const _ = require('lodash');
 const utils = require('./utils');
 
 const NO_UPDATE_MESSAGE = 'No updates are to be performed.';
+const TEMPLATE_MIN_SIZE_FOR_UPLOAD = 51200;
 
 module.exports = {
 
@@ -135,7 +136,7 @@ module.exports = {
 		});
 	},
 
-	aliasApplyStackChanges(currentTemplate, aliasStackTemplates, currentAliasStackTemplate) {
+	aliasApplyStackChanges(currentTemplate, aliasStackTemplates, currentAliasStackTemplate, templateUrl) {
 
 		const stackName = this._provider.naming.getStackName();
 
@@ -155,10 +156,15 @@ module.exports = {
 				'CAPABILITY_NAMED_IAM',
 			],
 			Parameters: [],
-			TemplateBody: JSON.stringify(currentTemplate),
 			Tags: _.map(_.keys(stackTags), key => ({ Key: key, Value: stackTags[key] })),
 		};
 
+		if (templateUrl) {
+			params.TemplateURL = templateUrl;
+		} else {
+			params.TemplateBody = JSON.stringify(currentTemplate);
+		}
+
 		this.options.verbose && this._serverless.cli.log(`Checking stack policy`);
 
 		// Policy must have at least one statement, otherwise no updates would be possible at all
@@ -185,8 +191,38 @@ module.exports = {
 
 	},
 
+	uploadCloudFormationTemplate(currentTemplate, aliasStackTemplates, currentAliasStackTemplate) {
+		const templateSize = JSON.stringify(currentTemplate).length;
+		if (templateSize < TEMPLATE_MIN_SIZE_FOR_UPLOAD) {
+			this.serverless.cli.log(`Skipping Upload of CloudFormation alias file to S3, size is only ${templateSize}`);
+			return BbPromise.resolve([ currentTemplate, aliasStackTemplates, currentAliasStackTemplate]);
+		}
+		this.serverless.cli.log('Uploading CloudFormation alias file to S3...');
+		const body = JSON.stringify(currentTemplate);
+
+		const fileName = 'compiled-cloudformation-template-alias.json';
+
+		let params = {
+			Bucket: this.bucketName,
+			Key: `${this.serverless.service.package.artifactDirectoryName}/${fileName}`,
+			Body: body,
+			ContentType: 'application/json',
+		};
+
+		return this.provider.request('S3',
+			'putObject',
+			params,
+			this._options.stage,
+			this._options.region)
+			.then(() => {
+				const templateUrl = `https://s3.amazonaws.com/${this.bucketName}/${this._serverless.service.package.artifactDirectoryName}/compiled-cloudformation-template-alias.json`;
+				return BbPromise.resolve([ currentTemplate, aliasStackTemplates, currentAliasStackTemplate, templateUrl ]);
+			});
+	},
+
 	aliasRemoveAliasStack(currentTemplate, aliasStackTemplates, currentAliasStackTemplate) {
 
+
 		const stackName = `${this._provider.naming.getStackName()}-${this._alias}`;
 
 		this.options.verbose && this._serverless.cli.log(`Removing CF stack ${stackName}`);
@@ -245,9 +281,8 @@ module.exports = {
 		return BbPromise.resolve([ currentTemplate, aliasStackTemplates, currentAliasStackTemplate ]).bind(this)
 		.spread(this.aliasCreateStackChanges)
 		.spread(this.aliasRemoveAliasStack)
+		.spread(this.uploadCloudFormationTemplate)
 		.spread(this.aliasApplyStackChanges)
 		.then(() => BbPromise.resolve());
-
 	}
-
 };

test/removeAlias.test.js

@@ -67,12 +67,14 @@ describe('removeAlias', () => {
 		let aliasCreateStackChangesStub;
 		let aliasRemoveAliasStackStub;
 		let aliasApplyStackChangesStub;
+		let uploadCloudFormationTemplateStub;
 		let pluginManagerSpawnStub;
 
 		beforeEach(() => {
 			aliasApplyStackChangesStub = sandbox.stub(awsAlias, 'aliasApplyStackChanges');
 			aliasCreateStackChangesStub = sandbox.stub(awsAlias, 'aliasCreateStackChanges');
 			aliasRemoveAliasStackStub = sandbox.stub(awsAlias, 'aliasRemoveAliasStack');
+			uploadCloudFormationTemplateStub = sandbox.stub(awsAlias, 'uploadCloudFormationTemplate');
 			pluginManagerSpawnStub = sandbox.stub(awsAlias._serverless.pluginManager, 'spawn');
 		});
 
@@ -131,12 +133,14 @@ describe('removeAlias', () => {
 			aliasApplyStackChangesStub.returns([ slsStack1, [ aliasStack2 ], aliasStack1 ]);
 			aliasCreateStackChangesStub.returns([ slsStack1, [ aliasStack2 ], aliasStack1 ]);
 			aliasRemoveAliasStackStub.returns([ slsStack1, [ aliasStack2 ], aliasStack1 ]);
+			uploadCloudFormationTemplateStub.returns([ slsStack1, [ aliasStack2 ], aliasStack1, 'templateUrl' ]);
 
 			return expect(awsAlias.removeAlias(slsStack1, [ aliasStack2 ], aliasStack1)).to.be.fulfilled
 			.then(() => BbPromise.all([
 				expect(aliasCreateStackChangesStub).to.have.been.calledOnce,
 				expect(aliasRemoveAliasStackStub).to.have.been.calledOnce,
 				expect(aliasApplyStackChangesStub).to.have.been.calledOnce,
+				expect(uploadCloudFormationTemplateStub).to.have.been.calledOnce,
 				expect(pluginManagerSpawnStub).to.not.have.been.called,
 			]));
 		});