From 058812ebc1baec63de17c700b22ff806809e69e0 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Fri, 1 Nov 2019 09:28:05 +0100 Subject: Add optional /api prefix --- .../controller/restapi/configserver/ConfigServerApiHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'controller-server/src/main/java/com/yahoo') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java index 0fcf705a7ce..f23161664a2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java @@ -35,6 +35,7 @@ import java.util.stream.Stream; @SuppressWarnings("unused") public class ConfigServerApiHandler extends AuditLoggingRequestHandler { + private static final String OPTIONAL_PREFIX = "/api"; private static final ZoneId CONTROLLER_ZONE = ZoneId.from("prod", "controller"); private static final List WHITELISTED_APIS = List.of("/flags/v1/", "/nodes/v2/", "/orchestrator/v1/"); @@ -72,7 +73,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler { } private HttpResponse get(HttpRequest request) { - Path path = new Path(request.getUri()); + Path path = new Path(request.getUri(), OPTIONAL_PREFIX); if (path.matches("/configserver/v1")) { return root(request); } @@ -80,7 +81,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler { } private HttpResponse proxy(HttpRequest request) { - Path path = new Path(request.getUri()); + Path path = new Path(request.getUri(), OPTIONAL_PREFIX); if ( ! path.matches("/configserver/v1/{environment}/{region}/{*}")) { return ErrorResponse.notFoundError("Nothing at " + path); } -- cgit v1.2.3