aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-11-01 09:28:05 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-11-01 09:28:05 +0100
commit058812ebc1baec63de17c700b22ff806809e69e0 (patch)
treedf60464a9135d31f39e7bef31a35a7077453bc03 /controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
parentbc97d8b0ccd40974dce1589f6bf5fbc2beaf28f9 (diff)
Add optional /api prefix
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java5
1 files changed, 3 insertions, 2 deletions
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<String> 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);
}