Merge pull request #31278 from vespa-engine/jonmv/avoid-trailing-slashes

Avoid trailing slashes in configserver clients
vespa-engine · May 22, 2024 · 35d47be · 35d47be
2 parents f66470f + ef52d60
commit 35d47be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -1192,7 +1192,7 @@ private HttpURL getLogServerURI(ApplicationId applicationId, Optional<DomainName
         // logs for any host if they are authorized for the hosted-vespa tenant.
         if (hostname.isPresent() && HOSTED_VESPA_TENANT.equals(applicationId.tenant())) {
             int port = List.of(InfrastructureApplication.CONFIG_SERVER.id(), InfrastructureApplication.CONTROLLER.id()).contains(applicationId) ? 19071 : 8080;
-            return HttpURL.create(Scheme.http, hostname.get(), port).withPath(HttpURL.Path.empty().append("logs"));
+            return HttpURL.create(Scheme.http, hostname.get(), port).withPath(HttpURL.Path.parse("logs"));
         }
 
         Application application = getApplication(applicationId);
@@ -1211,7 +1211,7 @@ private HttpURL getLogServerURI(ApplicationId applicationId, Optional<DomainName
                                                                              .findFirst())
                                                   .orElseThrow(() -> new IllegalArgumentException("No container running on logserver host"));
         int port = servicePort(logService);
-        return HttpURL.create(Scheme.http, DomainName.of(logServerHostInfo.getHostname()), port, HttpURL.Path.empty().append("logs"));
+        return HttpURL.create(Scheme.http, DomainName.of(logServerHostInfo.getHostname()), port, HttpURL.Path.parse("logs"));
     }
 
     private int servicePort(ServiceInfo serviceInfo) {

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java
@@ -72,7 +72,7 @@ private HttpResponse execute(HttpUriRequest request, String messageIfRequestFail
     }
 
     private HttpURL testerUrl(String testerHostname, int port, String... path) {
-        return HttpURL.create(Scheme.https, DomainName.of(testerHostname), port, Path.empty().append(List.of(path)));
+        return HttpURL.create(Scheme.https, DomainName.of(testerHostname), port, Path.empty().append(List.of(path)).withoutTrailingSlash());
     }
 
 }