diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-03-01 15:43:08 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2023-03-02 15:57:32 +0100 |
commit | d548d85092b289702c484ffe6ccb001c00232545 (patch) | |
tree | ca82c5fa1634ec380526c73b3c17f53271f9fa6c /controller-api | |
parent | 1a7ad922350594c63e830375f60bc3c88c581c58 (diff) |
Support finding archive bucket name in enclave account
Diffstat (limited to 'controller-api')
2 files changed, 11 insertions, 0 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 c391ea8f8f2..71425ca4b79 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 @@ -1,12 +1,14 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.archive; +import com.yahoo.config.provision.CloudAccount; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.hosted.controller.tenant.ArchiveAccess; import java.net.URI; import java.util.Map; +import java.util.Optional; import java.util.Set; /** @@ -23,5 +25,7 @@ public interface ArchiveService { boolean canAddTenantToBucket(ZoneId zoneId, ArchiveBucket bucket); + Optional<String> findEnclaveArchiveBucket(ZoneId zoneId, CloudAccount cloudAccount); + 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 b17e222f371..17f90f13988 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 @@ -1,6 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.api.integration.archive; +import com.yahoo.config.provision.CloudAccount; import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.hosted.controller.tenant.ArchiveAccess; @@ -9,6 +10,7 @@ import java.net.URI; import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Optional; import java.util.Set; /** @@ -39,6 +41,11 @@ public class MockArchiveService implements ArchiveService { } @Override + public Optional<String> findEnclaveArchiveBucket(ZoneId zoneId, CloudAccount cloudAccount) { + return Optional.empty(); + } + + @Override public URI bucketURI(ZoneId zoneId, String bucketName) { return URI.create(String.format("s3://%s/", bucketName)); } |