summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@verizonmedia.com>2020-07-23 11:13:11 +0200
committerOla Aunrønning <olaa@verizonmedia.com>2020-07-23 11:49:27 +0200
commit0570bb56b208b2189b2ad678e7a53d68c772d050 (patch)
treec0bcc5c1960ff58939e9de673e40b42704497eef /configserver
parent7973c1ec0805711dd568e46c59e7b99bb36696dc (diff)
Support fetching logs from specific node
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java8
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java8
2 files changed, 2 insertions, 14 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
index 937cf4dfe7f..58b7d0ec5bb 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -874,12 +874,8 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
// We make no validation that the hostname is actually allocated to the given application since
// most applications under hosted-vespa are not known to the model and it's OK for a user to get
// logs for any host if they are authorized for the hosted-vespa tenant.
- if (hostname.isPresent()) {
- if (HOSTED_VESPA_TENANT.equals(applicationId.tenant()))
- return "http://" + hostname.get() + ":8080/logs";
- else
- throw new IllegalArgumentException("Using hostname parameter when getting logs is not supported for application "
- + applicationId);
+ if (hostname.isPresent() && HOSTED_VESPA_TENANT.equals(applicationId.tenant())) {
+ return "http://" + hostname.get() + ":8080/logs";
}
Application application = getApplication(applicationId);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index a4b2bfb8902..e20fef0909c 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -234,14 +234,6 @@ public class ApplicationRepositoryTest {
assertEquals(200, response.getStatus());
}
- @Test(expected = IllegalArgumentException.class)
- public void refuseToGetLogsFromHostnameNotInApplication() {
- applicationRepository = createApplicationRepository();
- deployApp(testAppLogServerWithContainer);
- HttpResponse response = applicationRepository.getLogs(applicationId(), Optional.of("host123.fake.yahoo.com"), "");
- assertEquals(200, response.getStatus());
- }
-
@Test
public void deleteUnusedFileReferences() throws IOException {
File fileReferencesDir = temporaryFolder.newFolder();