diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-10-08 14:57:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-08 14:57:49 +0200 |
| commit | 5d805d9b1bc7c552992a063f153676ed39624d58 (patch) | |
| tree | 3de57c69c6abdc2e99648c41b6d9d68260f16b64 /controller-api | |
| parent | c54d87ce2c18bdd929e15942d39ce8cc33cd7087 (diff) | |
| parent | 1adde2639a7c2c669b0067cfb4d27c85474be99d (diff) | |
Merge pull request #19482 from vespa-engine/bjorncs/s3-policy
Bjorncs/s3 policy
Diffstat (limited to 'controller-api')
2 files changed, 2 insertions, 3 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 04e52c59d7a..5363e8d0150 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 @@ -5,7 +5,6 @@ import com.yahoo.config.provision.TenantName; import com.yahoo.config.provision.zone.ZoneId; import java.util.Map; -import java.util.Set; /** * Service that manages archive storage URIs for tenant nodes. @@ -15,7 +14,7 @@ import java.util.Set; */ public interface ArchiveService { - ArchiveBucket createArchiveBucketFor(ZoneId zoneId); + ArchiveBucket createArchiveBucketFor(ZoneId zoneId, boolean sharded); void updateBucketAndKeyPolicy(ZoneId zoneId, ArchiveBucket bucket, Map<TenantName, String> authorizeIamRoleByTenantName); } 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 c8e79a84925..5c979ddfc7b 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 @@ -16,7 +16,7 @@ public class MockArchiveService implements ArchiveService { public Map<ArchiveBucket, Map<TenantName, String>> authorizedIamRoles = new HashMap<>(); @Override - public ArchiveBucket createArchiveBucketFor(ZoneId zoneId) { + public ArchiveBucket createArchiveBucketFor(ZoneId zoneId, boolean sharded) { return new ArchiveBucket("bucketName", "keyArn"); } |