Merge pull request #437 from Financial-Times/matth/scale-inhibit-option

Add inhibit option to scale task and use for ship task

tasks/scale.js

@@ -36,9 +36,20 @@ function task (opts) {
 			}
 
 			const processProfiles = Object.keys(processInfo).map(process => {
-					return process + '=' + (opts.minimal ? 1 : processInfo[process].scale)
-						+ ':' + (opts.minimal ? 'standard-1X' : processInfo[process].size);
-				});
+				let scale = processInfo[process].scale;
+				let size = processInfo[process].size;
+
+				if (opts.minimal) {
+					scale = 1;
+					size = 'standard-1X';
+				}
+
+				if (opts.inhibit) {
+					scale = 0;
+				}
+
+				return `${process}=${scale}:${size}`;
+			});
 
 			return shellpromise('heroku ps:scale ' + processProfiles.join(' ') + ' --app ' + target, { verbose: true });
 
@@ -57,12 +68,14 @@ module.exports = function (program, utils) {
 	program
 		.command('scale [source] [target]')
 		.description('downloads process information from next-service-registry and scales/sizes the application servers')
-		.option('-m, --minimal', 'scales each dyno to a single instance (useful for provisioning a test app)')
+		.option('-m, --minimal', 'scales each dyno to a single instance')
+		.option('-i, --inhibit', 'scales each dyno down to 0')
 		.action(function (source, target, options) {
 			task({
 				source: source,
 				target: target,
-				minimal: options.minimal
+				minimal: options.minimal,
+				inhibit: options.inhibit
 			}).catch(utils.exit);
 		});
 };

tasks/ship.js

@@ -56,7 +56,7 @@ function task (opts) {
 		}
 
 		log.info('Scale staging app to 1 dyno');
-		yield scale({target:apps.staging, scale:'web=1'}).catch(function (){
+		yield scale({ source: appName, target: apps.staging, minimal: true }).catch(function (){
 			log.info('Failed to scale up staging app - is this the first run?')
 		});
 
@@ -86,7 +86,9 @@ function task (opts) {
 		}
 
 		log.info('scale staging app back to 0');
-		yield scale({target:apps.staging, scale:'web=0'});
+		yield scale({ source: appName, target: apps.staging, inhibit: true }).catch(() => {
+			log.warn('Failed to scale down staging app');
+		});
 
 		log.success('Shipped!');
 		log.art.ship(appName);

test/ship.test.js

@@ -58,10 +58,12 @@ describe('tasks/ship', function (){
 
 	it('Should scale to staging app up to 1 web dyno before deploying', function (){
 		let pipelineName = 'test';
+		let appName = 'sample-app';
+
 		return co(function* (){
 			yield ship({pipeline:pipelineName});
 
-			sinon.assert.calledWith(mockScale.task, {target:mockApps.staging, scale:'web=1'});
+			sinon.assert.calledWith(mockScale.task, {source:appName, target:mockApps.staging, minimal:true});
 		});
 	});
 
@@ -98,10 +100,12 @@ describe('tasks/ship', function (){
 
 	it('Should scale the staging app down to 0 when complete', function (){
 		let pipelineName = 'test';
+		let appName = 'sample-app';
+
 		return co(function* (){
 			yield ship({pipeline:pipelineName});
 
-			sinon.assert.calledWith(mockScale.task, {target:mockApps.staging, scale:'web=0'});
+			sinon.assert.calledWith(mockScale.task, {source:appName, target:mockApps.staging, inhibit:true});
 		});
 	});