aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2021-02-15 17:58:47 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2021-02-16 16:21:15 +0100
commit27467357145e29b0651f609edf0eb65c9b401dd4 (patch)
treeb9451b48d281917ffce888f845c76735b0746ed6 /node-admin
parentd8f5fb7419239dca120dbf5d9c07c3412149391e (diff)
Drop the initial slash in AWS key
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java8
2 files changed, 5 insertions, 5 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
index 3b88d28613c..6850fadaf42 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
@@ -63,7 +63,7 @@ public class SyncFileInfo {
}
private static Path destination(ApplicationId app, HostName hostName, String dir, Path filename, String extension) {
- StringBuilder sb = new StringBuilder(100).append('/');
+ StringBuilder sb = new StringBuilder(100);
if (app == null) sb.append("infrastructure");
else sb.append(app.tenant().value()).append('.').append(app.application().value()).append('.').append(app.instance().value());
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java
index 0d596a46d77..4ae64652a75 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java
@@ -34,7 +34,7 @@ public class SyncFileInfoTest {
@Test
public void tenant_access_log() {
SyncFileInfo sfi = SyncFileInfo.tenantAccessLog(bucket, application, hostname, accessLogPath);
- assertEquals(Paths.get("/tenant.application.instance/h12352a/logs/access/access.json-20210212.zst"), sfi.destPath());
+ assertEquals(Paths.get("tenant.application.instance/h12352a/logs/access/access.json-20210212.zst"), sfi.destPath());
assertEquals(bucket, sfi.bucketName());
assertNotEquals(ZstdCompressingInputStream.class, getInputStreamType(sfi));
}
@@ -42,21 +42,21 @@ public class SyncFileInfoTest {
@Test
public void tenant_vespa_log() {
SyncFileInfo sfi = SyncFileInfo.tenantVespaLog(bucket, application, hostname, vespaLogPath);
- assertEquals(Paths.get("/tenant.application.instance/h12352a/logs/vespa/vespa.log-2021-02-12.zst"), sfi.destPath());
+ assertEquals(Paths.get("tenant.application.instance/h12352a/logs/vespa/vespa.log-2021-02-12.zst"), sfi.destPath());
assertEquals(ZstdCompressingInputStream.class, getInputStreamType(sfi));
}
@Test
public void infra_access_log() {
SyncFileInfo sfi = SyncFileInfo.infrastructureAccessLog(bucket, hostname, accessLogPath);
- assertEquals(Paths.get("/infrastructure/h12352a/logs/access/access.json-20210212.zst"), sfi.destPath());
+ assertEquals(Paths.get("infrastructure/h12352a/logs/access/access.json-20210212.zst"), sfi.destPath());
assertNotEquals(ZstdCompressingInputStream.class, getInputStreamType(sfi));
}
@Test
public void infra_vespa_log() {
SyncFileInfo sfi = SyncFileInfo.infrastructureVespaLog(bucket, hostname, vespaLogPath);
- assertEquals(Paths.get("/infrastructure/h12352a/logs/vespa/vespa.log-2021-02-12.zst"), sfi.destPath());
+ assertEquals(Paths.get("infrastructure/h12352a/logs/vespa/vespa.log-2021-02-12.zst"), sfi.destPath());
assertEquals(ZstdCompressingInputStream.class, getInputStreamType(sfi));
}