Merge pull request #472 from Financial-Times/christos/update_service_…

…finding

Christos/update service finding

lib/find-service.js

@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = exports = (services, name) => {
+	let serviceData = services.find(service => service.name === name);
+
+	if (!serviceData) {
+		serviceData = services.find(service => service.systemCode === name);
+	}
+
+	return serviceData || null;
+};

tasks/configure.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var packageJson = require(process.cwd() + '/package.json');
+var findService = require('../lib/find-service');
 var herokuAuthToken = require('../lib/heroku-auth-token');
 var configVarsKey = require('../lib/config-vars-key');
 var normalizeName = require('../lib/normalize-name');
@@ -30,7 +31,15 @@ function fetchFromVault (source, target, registry = DEFAULT_REGISTRY_URI) {
 
 	const path = fetch(registry)
 		.then(fetchres.json)
-		.then(json => json.find(app => app.name === normalizeName(source)).config)
+		.then(json => {
+			const serviceData = findService(json, normalizeName(source));
+
+			if (!serviceData) {
+				throw new Error('Could not find a service in the registry, with `name` or `systemCode`, matching ' + source + '. Please check the service registry.');
+			}
+
+			return serviceData.config;
+		})
 		.then(url => url.replace('https://vault.in.ft.com/v1/',''));
 
 	return Promise.all([path, vault.get()])

tasks/scale.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const packageJson = require(process.cwd() + '/package.json');
+const findService = require('../lib/find-service');
 const herokuAuthToken = require('../lib/heroku-auth-token');
 const normalizeName = require('../lib/normalize-name');
 const fetchres = require('fetchres');
@@ -33,7 +34,12 @@ function task (opts) {
 		.then(() => fetch(registry))
 		.then(fetchres.json)
 		.then(data => {
-			const serviceData = data.find(service => service.name === source);
+			const serviceData = findService(data, source);
+
+			if (!serviceData) {
+				throw new Error('Could not find a service in the registry, with `name` or `systemCode`, matching ' + source + '. Please check the service registry.');
+			}
+
 			const processInfo = serviceData.processes;
 
 			if (!processInfo) {