From 0d11d9b68b51e265c8e7c6cafa6720cfaa439e2f Mon Sep 17 00:00:00 2001 From: Michael Irwin Date: Thu, 18 Oct 2018 00:16:52 -0400 Subject: [PATCH] Fix 404 when performing task lookup Resolves #51 --- server/app.js | 6 +++--- server/ecs.js | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/app.js b/server/app.js index b716bb5..b75b218 100644 --- a/server/app.js +++ b/server/app.js @@ -74,7 +74,7 @@ app.use(function *(next){ app.use(route.get('/api/clusters', list)); app.use(route.get('/api/clusters/:cluster', services)); -app.use(route.get('/api/clusters/:cluster/tasks/:family', tasks)); +app.use(route.get('/api/clusters/:cluster/tasks/:serviceName', tasks)); /** * Static routes. @@ -155,8 +155,8 @@ function *services(cluster){ * @param {String} taskArn */ -function *tasks(cluster, family){ +function *tasks(cluster, serviceName){ let ecs = this.ecs; - let task = yield ecs.tasks(cluster, family); + let task = yield ecs.tasks(cluster, serviceName); this.body = task; } diff --git a/server/ecs.js b/server/ecs.js index ae833e6..a6578d2 100644 --- a/server/ecs.js +++ b/server/ecs.js @@ -58,17 +58,17 @@ ECS.prototype.services = function(cluster){ * * @public * @param {String} cluster - the cluster name - * @param {String} family - the cluster name + * @param {String} serviceName - the service name * @return {Promise} [tasks] */ -ECS.prototype.tasks = function(cluster, family){ +ECS.prototype.tasks = function(cluster, serviceName){ if (this.disableTasks) { debug('listing tasks is disabled'); return Promise.resolve([]); } - debug('ecs.tasks(%s)', cluster, family); - return this.listTasks(cluster, family) + debug('ecs.tasks(%s)', cluster, serviceName); + return this.listTasks(cluster, serviceName) .bind(this) .then(this.describeTasks); }; @@ -200,14 +200,14 @@ ECS.prototype.task = function (task){ * * @public * @param {String} cluster the cluster name - * @param {String} family the family name + * @param {String} serviceName the service name * @return {Promise} { tasks, cluster} */ -ECS.prototype.listTasks = function (cluster, family){ +ECS.prototype.listTasks = function (cluster, serviceName){ debug('ecs.listTasks called'); return new Promise((resolve, reject) => { - const req = { cluster, family }; + const req = { cluster, serviceName }; this.ecs.listTasks(req, (err, res) => { if (err) return reject(err); const tasks = res.taskArns.map(taskArns => taskArns.split('/')[1])