default prefix services/

README.md

@@ -38,6 +38,7 @@ parameters:
     --spring.cloud.zookeeper.connect-string=<zookeeper-url> (defaults to localhost:2181)
     --spring.cloud.zookeeper.discovery.register=<true|false> (default: true, makes zk-apache-bridge itself discoverable)
     --zkapachebridge.healthcheck.interval=(default:20000, time in ms between healthchecks)
+    --zkapachebridge.urls.prefix=<prefix for the exposed endpoints> (defaults to 'services/')
 
     --zkapachebridge.rewritemap.active=<true|false> (default: true)
     --zkapachebridge.rewritemap.path=<path where to write the rewritemap> (default: /etc/apache2/maps/apimap.map)

zk-apache-bridge-docker/zk-apache-bridge-docker-rewritemap/src/main/docker/resources/000-default.conf

@@ -8,7 +8,7 @@
 
     # Capture service-name into '$1' and the path that follows into 'path'
     # and lookup that servicename in apimap
-    RewriteRule ^/([^\/]*)(.*)$ - [E=host:${apimap:$1|notfound},E=path:$2]
+    RewriteRule ^/(services/[^\/]*)(.*)$ - [E=host:${apimap:$1|notfound},E=path:$2]
 
     # if the previous rule found the service in apimap, rewrite to the service
     RewriteCond %{ENV:host} !notfound

zk-apache-bridge-it/src/test/java/eu/europa/ec/cc/zkapachebridge/rest/InfoControllerTest.java

@@ -42,13 +42,13 @@ public void getServiceInformation() {
     public void getLoadBalancerConfiguration() {
         assertThat(
                 this.restTemplate.getForObject("/api/info/loadbalancer", String.class),
-                new StringContains("ProxyPass /zk-apache-bridge"));
+                new StringContains("ProxyPass /services/zk-apache-bridge"));
     }
 
     @Test
     public void getRewriteMapConfiguration() {
         assertThat(
                 this.restTemplate.getForObject("/api/info/rewritemap", String.class),
-                new StringContains("zk-apache-bridge"));
+                new StringContains("services/zk-apache-bridge"));
     }
 }

zk-apache-bridge/src/main/java/eu/europa/ec/cc/zkapachebridge/apache/loadbalancer/LoadBalancerUpdater.java

@@ -37,6 +37,8 @@ public class LoadBalancerUpdater implements ApplicationListener<ServiceRegistryU
     @Value("${zkapachebridge.loadbalancer.apache-reload}")
     String apacheReload;
 
+    @Value("${zkapachebridge.urls.prefix:}")
+    String urlPrefix;
 
     @Autowired
     public LoadBalancerUpdater(Configuration freemarkerConfiguration, LoadBalancerWriter loadBalancerWriter, ServiceRegistry serviceRegistry) {
@@ -80,6 +82,7 @@ private String applyTemplate(Template template, Map<String, Object> model) throw
     private Map<String, Object> buildServicesFreemarkerModel() {
         Map<String, Object> model = new HashMap<>();
         model.put("services", serviceRegistry.getServices());
+        model.put("prefix", urlPrefix);
         return model;
     }
 

zk-apache-bridge/src/main/java/eu/europa/ec/cc/zkapachebridge/apache/rewritemap/RewriteMapUpdater.java

@@ -23,6 +23,9 @@ public class RewriteMapUpdater implements ApplicationListener<ServiceRegistryUpd
     @Value("${zkapachebridge.rewritemap.active}")
     boolean active;
 
+    @Value("${zkapachebridge.urls.prefix:}")
+    String urlPrefix;
+
     @Autowired
     public RewriteMapUpdater(Configuration freemarkerConfiguration, RewriteMapWriter rewriteMapWriter, ServiceRegistry serviceRegistry) {
         this.freemarkerConfiguration = freemarkerConfiguration;
@@ -47,7 +50,10 @@ public String getConfiguration() {
     private String buildRewriteMapContents() {
         Map<String, EndpointCollection> services = serviceRegistry.getServices();
         StringBuffer sb = new StringBuffer();
-        services.forEach((servicename, endpointCollection) -> sb.append(servicename)
+        services.forEach((servicename, endpointCollection) ->
+            sb
+                .append(urlPrefix)
+                .append(servicename)
                 .append("\t")
                 .append(String.join("|", endpointCollection.getActiveURIStrings()))
                 .append("\n"));

zk-apache-bridge/src/main/resources/application.yaml

@@ -11,6 +11,8 @@ spring:
 zkapachebridge:
   healthcheck:
     interval: 20000
+  urls:
+    prefix: services/
   rewritemap:
     active: true
     path: /etc/apache2/maps/apimap.map

zk-apache-bridge/src/main/resources/loadbalancer-config.ftl

@@ -6,5 +6,5 @@
             BalancerMember "${URI}"
         </#list>
     </Proxy>
-    ProxyPass /${key} balancer://${key}
+    ProxyPass /${prefix}${key} balancer://${key}
 </#list>

zk-apache-bridge/src/test/java/eu/europa/ec/cc/zkapachebridge/apache/loadbalancer/LoadBalancerUpdaterTest.java

@@ -33,6 +33,7 @@ public void buildLoadBalancerContentsTest() throws Exception {
         LoadBalancerUpdater loadBalancerUpdater = new LoadBalancerUpdater( freemarkerConfiguration,
                 rewriteMapWriter, serviceRegistry );
         loadBalancerUpdater.loadBalancerConfigTemplate = "loadbalancer-config.ftl";
+        loadBalancerUpdater.urlPrefix="services/";
         String content = loadBalancerUpdater.buildLoadBalancerContents();
 
         final Pattern balancerOne = Pattern.compile("\\Q<Proxy \"balancer://one\">\\E(.*?)</Proxy>", Pattern.DOTALL);