diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-03-05 13:38:57 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-03-05 13:38:57 +0100 |
| commit | 0cbb05c4275c73a251e7e6f232c9f829675f4771 (patch) | |
| tree | eb8151b9a32510be4d0c213b833b573230122b00 | |
| parent | 78d49cff9a3a69f9ef80d984502108d3f5298b08 (diff) | |
Add projectId to deployment API
3 files changed, 3 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 4d79b7bb24c..085554eb3da 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 @@ -578,6 +578,7 @@ class JobControllerApiHandlerHelper { Cursor responseObject = slime.setObject(); responseObject.setString("tenant", id.tenant().value()); responseObject.setString("application", id.application().value()); + application.projectId().ifPresent(projectId -> responseObject.setLong("projectId", projectId)); Map<JobId, List<Versions>> jobsToRun = status.jobsToRun(); Cursor stepsArray = responseObject.setArray("steps"); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json index de6a71c14de..65db44cb4e2 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json @@ -1,6 +1,7 @@ { "tenant": "tenant", "application": "application", + "projectId": 1001, "steps": [ { "type": "instance", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json index fe9d0573ed2..36aa8a87689 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json @@ -1,6 +1,7 @@ { "tenant": "tenant1", "application": "application1", + "projectId": 123, "steps": [ { "type": "instance", |