Store tenant managed archive buckets in ZK

5 files changed, 66 insertions, 18 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBuckets.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBuckets.java
new file mode 100644
index 00000000000..62e341c674c
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBuckets.java
@@ -0,0 +1,34 @@
+// 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 java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author freva
+ */
+public record ArchiveBuckets(Set<VespaManagedArchiveBucket> vespaManaged,
+                             Set<TenantManagedArchiveBucket> tenantManaged) {
+    public static final ArchiveBuckets EMPTY = new ArchiveBuckets(Set.of(), Set.of());
+
+    public ArchiveBuckets(Set<VespaManagedArchiveBucket> vespaManaged, Set<TenantManagedArchiveBucket> tenantManaged) {
+        this.vespaManaged = Set.copyOf(vespaManaged);
+        this.tenantManaged = Set.copyOf(tenantManaged);
+    }
+
+    /** Adds or replaces a VespaManagedArchive bucket with the given archive bucket */
+    public ArchiveBuckets with(VespaManagedArchiveBucket vespaManagedArchiveBucket) {
+        Set<VespaManagedArchiveBucket> updated = new HashSet<>(vespaManaged);
+        updated.removeIf(bucket -> bucket.bucketName().equals(vespaManagedArchiveBucket.bucketName()));
+        updated.add(vespaManagedArchiveBucket);
+        return new ArchiveBuckets(updated, tenantManaged);
+    }
+
+    /** Adds or replaces a TenantManagedArchive bucket with the given archive bucket */
+    public ArchiveBuckets with(TenantManagedArchiveBucket tenantManagedArchiveBucket) {
+        Set<TenantManagedArchiveBucket> updated = new HashSet<>(tenantManaged);
+        updated.removeIf(bucket -> bucket.cloudAccount().equals(tenantManagedArchiveBucket.cloudAccount()));
+        updated.add(tenantManagedArchiveBucket);
+        return new ArchiveBuckets(vespaManaged, updated);
+    }
+}
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 71425ca4b79..ed965f4331e 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
@@ -19,11 +19,11 @@ import java.util.Set;
  */
 public interface ArchiveService {
 
-    ArchiveBucket createArchiveBucketFor(ZoneId zoneId);
+    VespaManagedArchiveBucket createArchiveBucketFor(ZoneId zoneId);
 
-    void updatePolicies(ZoneId zoneId, Set<ArchiveBucket> buckets, Map<TenantName,ArchiveAccess> authorizeAccessByTenantName);
+    void updatePolicies(ZoneId zoneId, Set<VespaManagedArchiveBucket> buckets, Map<TenantName,ArchiveAccess> authorizeAccessByTenantName);
 
-    boolean canAddTenantToBucket(ZoneId zoneId, ArchiveBucket bucket);
+    boolean canAddTenantToBucket(ZoneId zoneId, VespaManagedArchiveBucket bucket);
 
     Optional<String> findEnclaveArchiveBucket(ZoneId zoneId, CloudAccount cloudAccount);
 
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 17f90f13988..4bed7c5177f 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
@@ -19,24 +19,22 @@ import java.util.Set;
  */
 public class MockArchiveService implements ArchiveService {
 
-
-    public Set<ArchiveBucket> archiveBuckets = new HashSet<>();
+    public Set<VespaManagedArchiveBucket> archiveBuckets = new HashSet<>();
     public Map<TenantName, ArchiveAccess> authorizeAccessByTenantName = new HashMap<>();
 
-
     @Override
-    public ArchiveBucket createArchiveBucketFor(ZoneId zoneId) {
-        return new ArchiveBucket("bucketName", "keyArn");
+    public VespaManagedArchiveBucket createArchiveBucketFor(ZoneId zoneId) {
+        return new VespaManagedArchiveBucket("bucketName", "keyArn");
     }
 
     @Override
-    public void updatePolicies(ZoneId zoneId, Set<ArchiveBucket> buckets, Map<TenantName, ArchiveAccess> authorizeAccessByTenantName) {
+    public void updatePolicies(ZoneId zoneId, Set<VespaManagedArchiveBucket> buckets, Map<TenantName, ArchiveAccess> authorizeAccessByTenantName) {
         this.archiveBuckets = new HashSet<>(buckets);
         this.authorizeAccessByTenantName = new HashMap<>(authorizeAccessByTenantName);
     }
 
     @Override
-    public boolean canAddTenantToBucket(ZoneId zoneId, ArchiveBucket bucket) {
+    public boolean canAddTenantToBucket(ZoneId zoneId, VespaManagedArchiveBucket bucket) {
         return bucket.tenants().size() < 5;
     }
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/TenantManagedArchiveBucket.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/TenantManagedArchiveBucket.java
new file mode 100644
index 00000000000..80e9762f84b
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/TenantManagedArchiveBucket.java
@@ -0,0 +1,15 @@
+// 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 java.time.Instant;
+
+/**
+ * Represents a cloud storage bucket (e.g. AWS S3 or Google Storage) used to store archive data - logs, heap/core dumps, etc.
+ * that is managed by the tenant directly.
+ *
+ * @author freva
+ */
+public record TenantManagedArchiveBucket(String bucketName, CloudAccount cloudAccount, Instant updatedAt) {
+}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucket.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/VespaManagedArchiveBucket.java
index be3b87ddc5c..c80e9b3780d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucket.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/VespaManagedArchiveBucket.java
@@ -8,20 +8,21 @@ import java.util.Objects;
 import java.util.Set;
 
 /**
- * Represents an S3 bucket used to store archive data - logs, heap/core dumps, etc.
+ * Represents a cloud storage bucket (e.g. AWS S3 or Google Storage) used to store archive data - logs, heap/core dumps, etc.
+ * that is managed by the Vespa controller.
  *
  * @author andreer
  */
-public class ArchiveBucket {
+public class VespaManagedArchiveBucket {
     private final String bucketName;
     private final String keyArn;
     private final Set<TenantName> tenants;
 
-    public ArchiveBucket(String bucketName, String keyArn) {
+    public VespaManagedArchiveBucket(String bucketName, String keyArn) {
         this(bucketName, keyArn, Set.of());
     }
 
-    private ArchiveBucket(String bucketName, String keyArn, Set<TenantName> tenants) {
+    private VespaManagedArchiveBucket(String bucketName, String keyArn, Set<TenantName> tenants) {
         this.bucketName = bucketName;
         this.keyArn = keyArn;
         this.tenants = Set.copyOf(tenants);
@@ -39,19 +40,19 @@ public class ArchiveBucket {
         return tenants;
     }
 
-    public ArchiveBucket withTenant(TenantName tenant) {
+    public VespaManagedArchiveBucket withTenant(TenantName tenant) {
         return withTenants(Set.of(tenant));
     }
 
-    public ArchiveBucket withTenants(Set<TenantName> tenants) {
-        return new ArchiveBucket(bucketName, keyArn, Sets.union(this.tenants, tenants));
+    public VespaManagedArchiveBucket withTenants(Set<TenantName> tenants) {
+        return new VespaManagedArchiveBucket(bucketName, keyArn, Sets.union(this.tenants, tenants));
     }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        ArchiveBucket that = (ArchiveBucket) o;
+        VespaManagedArchiveBucket that = (VespaManagedArchiveBucket) o;
         return bucketName.equals(that.bucketName) && keyArn.equals(that.keyArn) && tenants.equals(that.tenants);
     }