Merge pull request #17658 from vespa-engine/jonmv/rest-api-bindings-without-trailing-slash

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

4 files changed, 17 insertions, 31 deletions

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..e73f97304c1 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
@@ -1,53 +1,37 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.restapi;
 
-import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.LoggingRequestHandler;
-import com.yahoo.restapi.ErrorResponse;
-import com.yahoo.vespa.hosted.provision.NoSuchNodeException;
+import com.yahoo.restapi.RestApi;
+import com.yahoo.restapi.RestApiRequestHandler;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
-import com.yahoo.yolean.Exceptions;
 
 import javax.inject.Inject;
-import java.util.logging.Level;
 
 /**
  * @author mpolden
+ * @author jonmv
  */
-public class LoadBalancersV1ApiHandler extends LoggingRequestHandler {
+public class LoadBalancersV1ApiHandler extends RestApiRequestHandler<LoadBalancersV1ApiHandler> {
 
     private final NodeRepository nodeRepository;
 
     @Inject
     public LoadBalancersV1ApiHandler(LoggingRequestHandler.Context parentCtx, NodeRepository nodeRepository) {
-        super(parentCtx);
+        super(parentCtx, LoadBalancersV1ApiHandler::createRestApiDefinition);
         this.nodeRepository = nodeRepository;
     }
 
-    @Override
-    public HttpResponse handle(HttpRequest request) {
-        try {
-            switch (request.getMethod()) {
-                case GET: return handleGET(request);
-                default: return ErrorResponse.methodNotAllowed("Method '" + request.getMethod() + "' is not supported");
-            }
-        }
-        catch (NotFoundException | NoSuchNodeException e) {
-            return ErrorResponse.notFoundError(Exceptions.toMessageString(e));
-        }
-        catch (IllegalArgumentException e) {
-            return ErrorResponse.badRequest(Exceptions.toMessageString(e));
-        }
-        catch (RuntimeException e) {
-            log.log(Level.WARNING, "Unexpected error handling '" + request.getUri() + "'", e);
-            return ErrorResponse.internalServerError(Exceptions.toMessageString(e));
-        }
+    private static RestApi createRestApiDefinition(LoadBalancersV1ApiHandler self) {
+        return RestApi.builder()
+                      .addRoute(RestApi.route("/loadbalancers/v1")
+                                       .get(self::getLoadBalancers))
+                      .build();
     }
 
-    private HttpResponse handleGET(HttpRequest request) {
-        String path = request.getUri().getPath();
-        if (path.equals("/loadbalancers/v1/")) return new LoadBalancersResponse(request, nodeRepository);
-        throw new NotFoundException("Nothing at path '" + path + "'");
+    private HttpResponse getLoadBalancers(RestApi.RequestContext context) {
+        return new LoadBalancersResponse(context.request(), nodeRepository);
     }
+
 }
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..ebaf4d47887 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
@@ -33,10 +33,10 @@ public class ContainerConfig {
                "  <component id='com.yahoo.vespa.flags.InMemoryFlagSource'/>\n" +
                "  <component id='com.yahoo.config.provision.Zone'/>\n" +
                "  <handler id='com.yahoo.vespa.hosted.provision.restapi.NodesV2ApiHandler'>\n" +
-               "    <binding>http://*/nodes/v2/*</binding>\n" +
+               "    <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" +
                "    <server id='myServer' port='" + port + "'/>\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\":[]}");