List applications, not instances, under .../tenant/t/application

@freva please review and merge.

5 files changed, 35 insertions, 13 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
index 3994e05cbac..083984bd13c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ApplicationPackage.java
@@ -79,7 +79,7 @@ public class ApplicationPackage {
 
         Optional<Inspector> buildMetaObject = files.get("build-meta.json").map(SlimeUtils::jsonToSlime).map(Slime::get);
         if (requireFiles && buildMetaObject.isEmpty())
-            throw new IllegalArgumentException("Missing required file 'deployment.xml'");
+            throw new IllegalArgumentException("Missing required file 'build-meta.json'");
         this.compileVersion = buildMetaObject.flatMap(object -> parse(object, "compileVersion", field -> Version.fromString(field.asString())));
         this.buildTime = buildMetaObject.flatMap(object -> parse(object, "buildTime", field -> Instant.ofEpochMilli(field.asLong())));
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index b43ad28fcec..073306719f3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -432,12 +432,27 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     private HttpResponse applications(String tenantName, Optional<String> applicationName, HttpRequest request) {
         TenantName tenant = TenantName.from(tenantName);
         Slime slime = new Slime();
-        Cursor array = slime.setArray();
+        Cursor applicationArray = slime.setArray();
         for (Application application : controller.applications().asList(tenant)) {
             if (applicationName.map(application.id().application().value()::equals).orElse(true)) {
+                Cursor applicationObject = applicationArray.addObject();
+                applicationObject.setString("tenant", application.id().tenant().value());
+                applicationObject.setString("application", application.id().application().value());
+                applicationObject.setString("url", withPath("/application/v4" +
+                                                            "/tenant/" + application.id().tenant().value() +
+                                                            "/application/" + application.id().application().value(),
+                                                            request.getUri()).toString());
+                Cursor instanceArray = applicationObject.setArray("instances");
                 for (InstanceName instance : showOnlyProductionInstances(request) ? application.productionInstances().keySet()
-                                                                                  : application.instances().keySet())
-                    toSlime(application.id().instance(instance), array.addObject(), request);
+                                                                                  : application.instances().keySet()) {
+                    Cursor instanceObject = instanceArray.addObject();
+                    instanceObject.setString("instance", instance.value());
+                    instanceObject.setString("url", withPath("/application/v4" +
+                                                             "/tenant/" + application.id().tenant().value() +
+                                                             "/application/" + application.id().application().value() +
+                                                             "/instance/" + instance.value(),
+                                                             request.getUri()).toString());
+                }
             }
         }
         return new SlimeJsonResponse(slime);
@@ -1793,6 +1808,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
             }
             default: throw new IllegalArgumentException("Unexpected tenant type '" + tenant.type() + "'.");
         }
+        // TODO jonmv: This should list applications, not instances.
         Cursor applicationArray = object.setArray("applications");
         for (Application application : applications) {
             DeploymentStatus status = controller.jobController().deploymentStatus(application);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 1bdc3a22c2e..88faf54ea28 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.restapi.application;
 
 import ai.vespa.hosted.api.MultiPartStreamer;
 import ai.vespa.hosted.api.Signatures;
-import com.yahoo.application.container.handler.Headers;
 import com.yahoo.application.container.handler.Request;
 import com.yahoo.component.Version;
 import com.yahoo.config.application.api.ValidationId;
@@ -76,8 +75,6 @@ import org.junit.Test;
 import java.io.File;
 import java.math.BigDecimal;
 import java.net.URI;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.YearMonth;
@@ -92,7 +89,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import static com.yahoo.application.container.handler.Request.Method.DELETE;
 import static com.yahoo.application.container.handler.Request.Method.GET;
@@ -237,10 +233,10 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // GET tenant applications
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/", GET).userIdentity(USER_ID),
-                              new File("instance-list.json"));
+                              new File("application-list.json"));
         // GET tenant applications (instances of "application1" only)
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/", GET).userIdentity(USER_ID),
-                              new File("instance-list.json"));
+                              new File("application-list.json"));
         // GET at a tenant, with "&recursive=true&production=true", recurses over no instances yet, as they are not in deployment spec.
         tester.assertResponse(request("/application/v4/tenant/tenant1/", GET)
                                       .userIdentity(USER_ID)
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-list.json
new file mode 100644
index 00000000000..2479f127f92
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-list.json
@@ -0,0 +1,13 @@
+[
+  {
+    "tenant": "tenant1",
+    "application":"application1",
+    "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1",
+    "instances": [
+      {
+        "instance":"instance1",
+        "url":"http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1"
+      }
+    ]
+  }
+]
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-list.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-list.json
deleted file mode 100644
index 024ca11dbe3..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/instance-list.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-  @include(instance-reference.json)
-]
\ No newline at end of file