From 0597a3b8a694c74299417475ecdca118827a95d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 20 Sep 2017 15:46:29 +0200 Subject: [PATCH 1/6] Change job work in progress endpoint --- app/controllers/job_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/job_controller.js b/app/controllers/job_controller.js index f600bd19..0e2f2ba2 100644 --- a/app/controllers/job_controller.js +++ b/app/controllers/job_controller.js @@ -49,7 +49,7 @@ JobController.prototype.route = function (app) { this.createJob.bind(this) ); app.get( - global.settings.base_url + '/sql/job/wip', + global.settings.base_url + '/jobs-wip', userMiddleware, authenticatedMiddleware(this.userDatabaseService), this.listWorkInProgressJobs.bind(this) ); From 4d910a712cc0fadb71148215747f80439dfd6876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 20 Sep 2017 16:03:23 +0200 Subject: [PATCH 2/6] Set trusty distributio in travis' configuration --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f0be6ebb..f5ae9ee8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: precise addons: apt: sources: From 102a17c12bf200d5e891cf01c1eb6dd68f9d8051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 20 Sep 2017 16:17:33 +0200 Subject: [PATCH 3/6] Fix test --- test/support/batch-test-client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/support/batch-test-client.js b/test/support/batch-test-client.js index b39d3887..ac471dbb 100644 --- a/test/support/batch-test-client.js +++ b/test/support/batch-test-client.js @@ -109,7 +109,7 @@ BatchTestClient.prototype.getWorkInProgressJobs = function(override, callback) { assert.response( this.server, { - url: this.getUrl(override, 'wip'), + url: '/api/v1/jobs-wip', headers: { host: this.getHost(override) }, From 980e762ab774b5411e082f0ef2cc2d2889b15b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 20 Sep 2017 16:35:33 +0200 Subject: [PATCH 4/6] Skip user auth middlewares --- app/controllers/job_controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/job_controller.js b/app/controllers/job_controller.js index 0e2f2ba2..25d9a3a2 100644 --- a/app/controllers/job_controller.js +++ b/app/controllers/job_controller.js @@ -50,7 +50,6 @@ JobController.prototype.route = function (app) { ); app.get( global.settings.base_url + '/jobs-wip', - userMiddleware, authenticatedMiddleware(this.userDatabaseService), this.listWorkInProgressJobs.bind(this) ); app.get( From b1112e2bb1c0c035bb882e32ead03af951423b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 20 Sep 2017 16:48:22 +0200 Subject: [PATCH 5/6] Remove unneeded header --- app/controllers/job_controller.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/controllers/job_controller.js b/app/controllers/job_controller.js index 25d9a3a2..63e63274 100644 --- a/app/controllers/job_controller.js +++ b/app/controllers/job_controller.js @@ -95,8 +95,6 @@ JobController.prototype.listWorkInProgressJobs = function (req, res) { return handleException(err, res); } - res.header('X-Served-By-DB-Host', req.context.userDatabase.host); - req.profiler.done('list'); req.profiler.end(); req.profiler.sendStats(); From a09f3019b1f5aa1bb2e3c67dc1e2704d4971a076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 20 Sep 2017 17:23:06 +0200 Subject: [PATCH 6/6] Update NEWS --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index 6cb8ecc8..529fde2b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,9 @@ ## 1.47.2 Released 2017-mm-dd +Announcements: + * Change work in progress jobs endpoint from `[..]/job/wip` to `[..]/jobs-wip` + ## 1.47.1 Released 2017-08-13