diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-08-13 16:19:03 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-08-15 08:53:50 +0200 |
| commit | 0397e767551e5ba6ae8f2605399a0f3bf47218a3 (patch) | |
| tree | b63ceeef8fe80f126620206ceba20e94b1fa4a01 /controller-server | |
| parent | 3eee55299ef85cb15b61ccdcc7dc89c5e6a4d95e (diff) | |
Expose version information in HTTP API
Diffstat (limited to 'controller-server')
3 files changed, 18 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index 6b8b14cf9b0..d64dad2e3cd 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -82,6 +82,12 @@ class JobControllerApiHandlerHelper { cursor.setLong("id", run.id().number()); String logsPath = baseUriForJobType.getPath() + "/run/" + run.id().number(); cursor.setString("logs", baseUriForJobType.resolve(logsPath).toString()); + + cursor.setString("targetPlatform", run.versions().targetPlatform().toString()); + cursor.setString("targetApplication", run.versions().targetApplication().id()); + run.versions().sourcePlatform().ifPresent(version -> cursor.setString("sourcePlatform", version.toString())); + run.versions().sourceApplication().ifPresent(version -> cursor.setString("sourceApplication", version.id())); + } /** diff --git a/controller-server/src/test/resources/job/job-type-response.json b/controller-server/src/test/resources/job/job-type-response.json index 7e7953486fa..81f2e0233cd 100644 --- a/controller-server/src/test/resources/job/job-type-response.json +++ b/controller-server/src/test/resources/job/job-type-response.json @@ -7,6 +7,8 @@ "start":"2018-06-27T10:12:35Z", "end":"2018-06-27T10:13:05Z", "id":1, + "targetPlatform": "1.2.3", + "targetApplication": "1.0.321-bada55", "steps":[ { "deployInitialReal":"succeeded" @@ -54,6 +56,8 @@ "start":"2018-06-27T10:12:35Z", "end":"2018-06-27T10:13:35Z", "id":1, + "targetPlatform": "1.2.3", + "targetApplication": "1.0.321-bada55", "steps":[ { "deployInitialReal":"succeeded" @@ -100,6 +104,8 @@ "status":"error", "start":"2018-06-27T10:12:35Z", "id":1, + "targetPlatform": "1.2.3", + "targetApplication": "1.0.321-bada55", "steps":[ { "deployInitialReal":"succeeded" diff --git a/controller-server/src/test/resources/job/run-status-response.json b/controller-server/src/test/resources/job/run-status-response.json index 43d32efed8f..8c89132e05e 100644 --- a/controller-server/src/test/resources/job/run-status-response.json +++ b/controller-server/src/test/resources/job/run-status-response.json @@ -4,6 +4,8 @@ "start":"2018-06-27T10:12:35Z", "end":"2018-06-27T10:13:19Z", "id":1, + "targetPlatform": "1.2.3", + "targetApplication": "1.0.321-bada55", "steps":[ { "deployInitialReal":"succeeded" @@ -45,6 +47,8 @@ "status":"error", "start":"2018-06-27T10:12:35Z", "id":2, + "targetPlatform": "1.2.3", + "targetApplication": "1.0.321-bada55", "steps":[ { "deployInitialReal":"succeeded" @@ -87,6 +91,8 @@ "start":"2018-06-27T10:12:35Z", "end":"2018-06-27T10:13:05Z", "id":3, + "targetPlatform": "1.2.3", + "targetApplication": "1.0.321-bada55", "steps":[ { "deployInitialReal":"succeeded" |