Merge pull request #14500 from vespa-engine/smorgrav/routing_api_prefix

Add optional prefix for 443 access

4 files changed, 19 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
index ba40f9c2085..114a2967e9a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
@@ -42,6 +42,7 @@ import java.util.stream.Collectors;
  */
 public class RoutingApiHandler extends AuditLoggingRequestHandler {
 
+    private static final String OPTIONAL_PREFIX = "/api";
     private final Controller controller;
 
     public RoutingApiHandler(Context ctx, Controller controller) {
@@ -52,7 +53,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
     @Override
     public HttpResponse auditAndHandle(HttpRequest request) {
         try {
-            var path = new Path(request.getUri());
+            var path = new Path(request.getUri(), OPTIONAL_PREFIX);
             switch (request.getMethod()) {
                 case GET: return get(path, request);
                 case POST: return post(path);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
index f79051f2edb..4b4a8415d69 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java
@@ -106,6 +106,7 @@ public class ControllerContainerTest {
                "  </handler>\n" +
                "  <handler id='com.yahoo.vespa.hosted.controller.restapi.routing.RoutingApiHandler'>\n" +
                "    <binding>http://*/routing/v1/*</binding>\n" +
+               "    <binding>http://*/api/routing/v1/*</binding>\n" +
                "  </handler>\n" +
                variablePartXml() +
                "</container>";
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java
index fefd23eb67c..b0549662ab0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiTest.java
@@ -76,6 +76,12 @@ public class RoutingApiTest extends ControllerContainerTest {
         tester.assertResponse(operatorRequest("http://localhost:8080/routing/v1/status/environment/", "",
                                               Request.Method.GET),
                               new File("discovery/environment.json"));
+
+        // GET instance with api prefix (test that the /api prefix works)
+        tester.assertResponse(authenticatedRequest("http://localhost:8080/api/routing/v1/status/tenant/t1/application/a1/instance/default/",
+                "",
+                Request.Method.GET),
+                new File("discovery/instance_api.json"));
     }
 
     @Test
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/discovery/instance_api.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/discovery/instance_api.json
new file mode 100644
index 00000000000..a9e789d9fe9
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/discovery/instance_api.json
@@ -0,0 +1,10 @@
+{
+  "resources": [
+    {
+      "url": "http://localhost:8080/api/routing/v1/status/tenant/t1/application/a1/instance/default/environment/prod/region/us-east-3/"
+    },
+    {
+      "url": "http://localhost:8080/api/routing/v1/status/tenant/t1/application/a1/instance/default/environment/prod/region/us-west-1/"
+    }
+  ]
+}
\ No newline at end of file