From dbe1d53b29e2fc699bd98fd9cf393be2e1987809 Mon Sep 17 00:00:00 2001 From: smorgrav Date: Wed, 23 Sep 2020 10:44:41 +0200 Subject: Add optional prefix for 443 access --- .../vespa/hosted/controller/restapi/routing/RoutingApiHandler.java | 3 ++- .../vespa/hosted/controller/restapi/routing/RoutingApiTest.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'controller-server/src') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java index ba40f9c2085..114a2967e9a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java @@ -42,6 +42,7 @@ import java.util.stream.Collectors; */ public class RoutingApiHandler extends AuditLoggingRequestHandler { + private static final String OPTIONAL_PREFIX = "/api"; private final Controller controller; public RoutingApiHandler(Context ctx, Controller controller) { @@ -52,7 +53,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { @Override public HttpResponse auditAndHandle(HttpRequest request) { try { - var path = new Path(request.getUri()); + var path = new Path(request.getUri(), OPTIONAL_PREFIX); switch (request.getMethod()) { case GET: return get(path, request); case POST: return post(path); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java index fefd23eb67c..25d21dd702d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java @@ -55,6 +55,11 @@ public class RoutingApiTest extends ControllerContainerTest { Request.Method.GET), new File("discovery/root.json")); + // GET root with api prefix + tester.assertResponse(operatorRequest("http://localhost:8080/api/routing/v1/", "", + Request.Method.GET), + new File("discovery/root.json")); + // GET tenant tester.assertResponse(operatorRequest("http://localhost:8080/routing/v1/status/tenant/t1", "", Request.Method.GET), -- cgit v1.2.3