diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2021-04-29 13:28:23 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2021-04-29 13:28:23 +0200 |
| commit | de713e9880e1610908595a9aa88a66dce5be80c5 (patch) | |
| tree | 5b49294369f32c3921e597ef61ca4a98d53ed663 /configserver | |
| parent | 126d4f78c4464c79f3365c433890119306693102 (diff) | |
Support loadbalancer/v1 and application/v2/tenant without trailing slash
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java | 4 | ||||
| -rw-r--r-- | configserver/src/main/resources/configserver-app/services.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java index 6aff3b8a361..d4166b5664c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java @@ -93,7 +93,7 @@ public class TenantHandler extends HttpHandler { private static BindingMatch<?> getBindingMatch(HttpRequest request) { return HttpConfigRequests.getBindingMatch(request, - "http://*/application/v2/tenant/", + "http://*/application/v2/tenant", "http://*/application/v2/tenant/*"); } @@ -103,7 +103,7 @@ public class TenantHandler extends HttpHandler { private static boolean isListTenantsRequest(HttpRequest request) { return getBindingMatch(request).groupCount() == 2 && - request.getUri().getPath().endsWith("/tenant/"); + request.getUri().getPath().matches("/application/v2/tenant/?"); } private static TenantName getTenantNameFromRequest(HttpRequest request) { diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml index fd8bda8f305..f633f4c6d48 100644 --- a/configserver/src/main/resources/configserver-app/services.xml +++ b/configserver/src/main/resources/configserver-app/services.xml @@ -102,7 +102,7 @@ <binding>http://*/status</binding> </handler> <handler id='com.yahoo.vespa.config.server.http.v2.TenantHandler' bundle='configserver'> - <binding>http://*/application/v2/tenant/</binding> + <binding>http://*/application/v2/tenant</binding> <binding>http://*/application/v2/tenant/*</binding> </handler> <handler id='com.yahoo.vespa.config.server.http.v2.SessionCreateHandler' bundle='configserver'> |