Return 404 when listing instances for application that does not exist

2 files changed, 28 insertions, 20 deletions

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 d022588c757..1ca34f2c47c 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
@@ -546,28 +546,32 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         if (controller.tenants().get(tenantName).isEmpty())
             return ErrorResponse.notFoundError("Tenant '" + tenantName + "' does not exist");
 
+        List<Application> applications = applicationName.isEmpty() ?
+                controller.applications().asList(tenant) :
+                controller.applications().getApplication(TenantAndApplicationId.from(tenantName, applicationName.get()))
+                    .map(List::of)
+                    .orElseThrow(() -> new NotExistsException("Application '" + applicationName.get() + "' does not exist"));
+
         Slime slime = new Slime();
         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()) {
-                    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());
-                }
+        for (Application application : applications) {
+            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()) {
+                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);
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 3fa593fcf64..3c0eaaa153d 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
@@ -225,6 +225,10 @@ public class ApplicationApiTest extends ControllerContainerTest {
         // GET tenant applications
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/", GET).userIdentity(USER_ID),
                               new File("application-list.json"));
+        // GET tenant application instances for application that does not exist
+        tester.assertResponse(request("/application/v4/tenant/tenant1/application/fake-app/instance/", GET).userIdentity(USER_ID),
+                "{\"error-code\":\"NOT_FOUND\",\"message\":\"Application 'fake-app' does not exist\"}", 404);
+
         // GET tenant applications (instances of "application1" only)
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/instance/", GET).userIdentity(USER_ID),
                               new File("application-list.json"));