Support loadbalancer/v1 and application/v2/tenant without trailing slash

7 files changed, 9 insertions, 6 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'>
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java
index 028d0d69df6..d01c91c53ab 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/application/BindingSetTestCase.java
@@ -249,7 +249,7 @@ public class BindingSetTestCase {
         handlers.put(new UriPattern("http://*/config/v1/*/"), foo1);
         handlers.put(new UriPattern("http://*/config/v1/*/*"), foo2);
         handlers.put(new UriPattern("http://*/config/v1/*/*/"), foo3);
-        handlers.put(new UriPattern("http://*/application/v2/tenant/"), foo4);
+        handlers.put(new UriPattern("http://*/application/v2/tenant"), foo4);
         handlers.put(new UriPattern("http://*/application/v2/tenant/*"), foo5);
         handlers.put(new UriPattern("http://*/application/v2/tenant/*/session"), foo6);
         handlers.put(new UriPattern("http://*/application/v2/tenant/*/session/*/prepared"), foo7);
@@ -276,7 +276,7 @@ public class BindingSetTestCase {
         assertSame(foo3, bindings.resolve(URI.create("http://abcxyz.yahoo.com:19071" +
                 "/config/v1/cloud.config.log.logd/admin/")));
         assertSame(foo4, bindings.resolve(URI.create("http://abcxyz.yahoo.com:19071" +
-                "/application/v2/tenant/")));
+                "/application/v2/tenant")));
         assertSame(foo5, bindings.resolve(URI.create("http://abcxyz.yahoo.com:19071" +
                 "/application/v2/tenant/b")));
         assertSame(foo6, bindings.resolve(URI.create("http://abcxyz.yahoo.com:19071" +
diff --git a/node-repository/src/main/config/node-repository.xml b/node-repository/src/main/config/node-repository.xml
index a12e2a8b11c..8a6e466fdf3 100644
--- a/node-repository/src/main/config/node-repository.xml
+++ b/node-repository/src/main/config/node-repository.xml
@@ -14,6 +14,7 @@
 </handler>
 
 <handler id="com.yahoo.vespa.hosted.provision.restapi.LoadBalancersV1ApiHandler" bundle="node-repository">
+    <binding>http://*/loadbalancers/v1</binding>
     <binding>http://*/loadbalancers/v1/*</binding>
 </handler>
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java
index f81e3240397..4c4011daa3d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiHandler.java
@@ -47,7 +47,7 @@ public class LoadBalancersV1ApiHandler extends LoggingRequestHandler {
 
     private HttpResponse handleGET(HttpRequest request) {
         String path = request.getUri().getPath();
-        if (path.equals("/loadbalancers/v1/")) return new LoadBalancersResponse(request, nodeRepository);
+        if (path.matches("/loadbalancers/v1/?")) return new LoadBalancersResponse(request, nodeRepository);
         throw new NotFoundException("Nothing at path '" + path + "'");
     }
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java
index 5e40c0bd9ff..bfd1bc6565c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java
@@ -36,6 +36,7 @@ public class ContainerConfig {
                "    <binding>http://*/nodes/v2/*</binding>\n" +
                "  </handler>\n" +
                "  <handler id='com.yahoo.vespa.hosted.provision.restapi.LoadBalancersV1ApiHandler'>\n" +
+               "    <binding>http://*/loadbalancers/v1</binding>\n" +
                "    <binding>http://*/loadbalancers/v1/*</binding>\n" +
                "  </handler>\n" +
                "  <http>\n" +
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiTest.java
index e9811985b7d..1ca552bca94 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersV1ApiTest.java
@@ -22,6 +22,7 @@ public class LoadBalancersV1ApiTest {
 
     @Test
     public void test_load_balancers() throws Exception {
+        tester.assertFile(new Request("http://localhost:8080/loadbalancers/v1"), "load-balancers.json");
         tester.assertFile(new Request("http://localhost:8080/loadbalancers/v1/"), "load-balancers.json");
         tester.assertFile(new Request("http://localhost:8080/loadbalancers/v1/?application=tenant4.application4.instance4"), "load-balancers-single.json");
         tester.assertResponse(new Request("http://localhost:8080/loadbalancers/v1/?application=tenant.nonexistent.default"), "{\"loadBalancers\":[]}");