Wrap logs in the "log" field

2 files changed, 22 insertions, 19 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 c0b680d21f0..27810306fa7 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
@@ -104,9 +104,9 @@ class JobControllerApiHandlerHelper {
      */
     static HttpResponse runDetailsResponse(JobController jobController, RunId runId, String after) {
         Slime slime = new Slime();
-        Cursor logsObject = slime.setObject();
+        Cursor detailsObject = slime.setObject();
 
-        logsObject.setBool("active", jobController.active(runId).isPresent());
+        detailsObject.setBool("active", jobController.active(runId).isPresent());
         jobController.updateTestLog(runId);
 
         RunLog runLog = (after == null ? jobController.details(runId) : jobController.details(runId, Long.parseLong(after)))
@@ -114,10 +114,11 @@ class JobControllerApiHandlerHelper {
                         "No run details exist for application: %s, job type: %s, number: %d",
                         runId.application().toShortString(), runId.type().jobName(), runId.number())));
 
+        Cursor logObject = detailsObject.setObject("log");
         for (Step step : Step.values()) {
-            runLog.get(step).ifPresent(entries -> toSlime(logsObject.setArray(step.name()), entries));
+            runLog.get(step).ifPresent(entries -> toSlime(logObject.setArray(step.name()), entries));
         }
-        runLog.lastId().ifPresent(id -> logsObject.setLong("lastId", id));
+        runLog.lastId().ifPresent(id -> detailsObject.setLong("lastId", id));
 
         return new SlimeJsonResponse(slime);
     }
diff --git a/controller-server/src/test/resources/job/run-details-response.json b/controller-server/src/test/resources/job/run-details-response.json
index 95622313852..22d3d1d1546 100644
--- a/controller-server/src/test/resources/job/run-details-response.json
+++ b/controller-server/src/test/resources/job/run-details-response.json
@@ -1,19 +1,21 @@
 {
   "active":false,
   "lastId":2,
-  "deployTester":[],
-  "installTester":[
-    {
-      "at":12,
-      "type":"debug",
-      "message":"SUCCESS"
-    }
-  ],
-  "deactivateTester":[
-    {
-      "at":123,
-      "type":"warning",
-      "message":"ERROR"
-    }
-  ]
+  "log": {
+    "deployTester":[],
+    "installTester": [
+      {
+        "at": 12,
+        "type": "debug",
+        "message": "SUCCESS"
+      }
+    ],
+    "deactivateTester": [
+      {
+        "at": 123,
+        "type": "warning",
+        "message": "ERROR"
+      }
+    ]
+  }
 }