Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.

Fix 404 when performing task lookup #57

Open
mikesir87 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix 404 when performing task lookup #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d11d9b
Fix 404 when performing task lookup
mikesir87 Oct 18, 2018
61fd35f
Merge branch 'master' into 51-fix-404-task-lookup
mikesir87 Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions server/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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;
}
14 changes: 7 additions & 7 deletions server/ecs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
Expand Down Expand Up @@ -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])
Expand Down