From f83646545c4aa9e8921550949bdc5be6e045d985 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@verizonmedia.com>
Date: Fri, 25 Oct 2019 12:55:54 +0200
Subject: Add logs binding with instance name

---
 .../com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java | 8 ++++----
 configserver/src/main/resources/configserver-app/services.xml     | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'configserver')

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
index e18c6ad6c56..0d27af0a7ad 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java
@@ -20,7 +20,6 @@ import com.yahoo.vespa.config.server.http.HttpErrorResponse;
 import com.yahoo.vespa.config.server.http.HttpHandler;
 import com.yahoo.vespa.config.server.http.JSONResponse;
 import com.yahoo.vespa.config.server.http.NotFoundException;
-import com.yahoo.vespa.config.server.tenant.Tenant;
 
 import java.time.Duration;
 import java.util.Optional;
@@ -149,8 +148,9 @@ public class ApplicationHandler extends HttpHandler {
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge/*",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/metrics",
+                "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/logs",
                 "http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*",
-                "http://*/application/v2/tenant/*/application/*/logs",
+                "http://*/application/v2/tenant/*/application/*/logs", // TODO: Remove once all clients switched to handler with instance name
                 "http://*/application/v2/tenant/*/application/*");
     }
 
@@ -165,8 +165,8 @@ public class ApplicationHandler extends HttpHandler {
     }
 
     private static boolean isLogRequest(HttpRequest request) {
-        return getBindingMatch(request).groupCount() == 4 &&
-                request.getUri().getPath().endsWith("/logs");
+        return request.getUri().getPath().endsWith("/logs") &&
+                (getBindingMatch(request).groupCount() == 4 || getBindingMatch(request).groupCount() == 7);
     }
 
     private static boolean isServiceConvergeListRequest(HttpRequest request) {
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index 22697c29fe4..baec8a31a8b 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -126,6 +126,7 @@
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/metrics</binding>
+      <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/logs</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/logs</binding>
-- 
cgit v1.2.3