diff options
| author | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-03-01 13:36:40 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-03-02 15:57:32 +0100 |
| commit | 1a7ad922350594c63e830375f60bc3c88c581c58 (patch) | |
| tree | 4ed212648369e58de68c31c6a642429e479fc8e2 /controller-api | |
| parent | f28ae4c9a633dd52f57401544b393b9eca54eba2 (diff) | |
Remove tenant name from archive URI
Diffstat (limited to 'controller-api')
2 files changed, 3 insertions, 4 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java index 46e7fb48553..c391ea8f8f2 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveService.java @@ -23,5 +23,5 @@ public interface ArchiveService { boolean canAddTenantToBucket(ZoneId zoneId, ArchiveBucket bucket); - URI bucketURI(ZoneId zoneId, String bucketName, TenantName tenantName); + URI bucketURI(ZoneId zoneId, String bucketName); } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java index a2847439ce7..b17e222f371 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/MockArchiveService.java @@ -10,7 +10,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import java.util.TreeMap; /** * @author freva @@ -40,7 +39,7 @@ public class MockArchiveService implements ArchiveService { } @Override - public URI bucketURI(ZoneId zoneId, String bucketName, TenantName tenantName) { - return URI.create(String.format("s3://%s/%s/", bucketName, tenantName.value())); + public URI bucketURI(ZoneId zoneId, String bucketName) { + return URI.create(String.format("s3://%s/", bucketName)); } } |