404 when requesting endpoints for non-existent deployments

1 files changed, 5 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index ad1e4ded76f..2dd3b1dda23 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -504,6 +504,11 @@ public class ApplicationController {
 
     /** Returns the endpoints of the deployment, or an empty list if the request fails */
     public Optional<List<URI>> getDeploymentEndpoints(DeploymentId deploymentId) {
+        if ( ! get(deploymentId.applicationId())
+                .map(application -> application.deployments().containsKey(deploymentId.zoneId()))
+                .orElse(deploymentId.applicationId().instance().isTester()))
+            throw new NotExistsException("Deployment", deploymentId.toString());
+
         try {
             return Optional.of(ImmutableList.copyOf(routingGenerator.endpoints(deploymentId).stream()
                                                                     .map(RoutingEndpoint::getEndpoint)