archive bucket db (#17073)

4 files changed, 99 insertions, 14 deletions

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/ArchiveBucket.java
new file mode 100644
index 00000000000..6bdaced2642
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucket.java
@@ -0,0 +1,71 @@
+// Copyright Verizon Media. 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.google.common.collect.Sets;
+import com.yahoo.config.provision.TenantName;
+
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Represents an S3 bucket used to store archive data - logs, heap/core dumps, etc.
+ *
+ * @author andreer
+ */
+public class ArchiveBucket {
+    private final String bucketName;
+    private final String keyArn;
+    private final Set<TenantName> tenants;
+
+    public ArchiveBucket(String bucketName, String keyArn) {
+        this(bucketName, keyArn, Set.of());
+    }
+
+    private ArchiveBucket(String bucketName, String keyArn, Set<TenantName> tenants) {
+        this.bucketName = bucketName;
+        this.keyArn = keyArn;
+        this.tenants = Set.copyOf(tenants);
+    }
+
+    public String bucketName() {
+        return bucketName;
+    }
+
+    public String keyArn() {
+        return keyArn;
+    }
+
+    public Set<TenantName> tenants() {
+        return tenants;
+    }
+
+    public ArchiveBucket withTenant(TenantName tenant) {
+        return withTenants(Set.of(tenant));
+    }
+
+    public ArchiveBucket withTenants(Set<TenantName> tenants) {
+        return new ArchiveBucket(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;
+        return bucketName.equals(that.bucketName) && keyArn.equals(that.keyArn) && tenants.equals(that.tenants);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(bucketName, keyArn, tenants);
+    }
+
+    @Override
+    public String toString() {
+        return "ArchiveBucket{" +
+                "bucketName='" + bucketName + '\'' +
+                ", keyArn='" + keyArn + '\'' +
+                ", tenants=" + tenants +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java
new file mode 100644
index 00000000000..91c7cd68ea2
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/archive/ArchiveBucketDb.java
@@ -0,0 +1,16 @@
+// Copyright 2021 Oath Inc. 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.TenantName;
+import com.yahoo.config.provision.zone.ZoneId;
+
+import java.net.URI;
+import java.util.Optional;
+import java.util.Set;
+
+public interface ArchiveBucketDb {
+
+    Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant);
+
+    Set<ArchiveBucket> buckets(ZoneId zoneId);
+}
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 cdde20b4554..47aaf1740e1 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
@@ -4,20 +4,18 @@ package com.yahoo.vespa.hosted.controller.api.integration.archive;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 
-import java.net.URI;
-import java.util.Optional;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Service that manages archive storage URIs for tenant nodes.
  *
  * @author freva
+ * @author andreer
  */
 public interface ArchiveService {
 
-    Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant);
-
-    // TODO: Method to configure archive permissions/access for a tenant
-
-    // TODO: Method to revoke permission/access for a tenant
+    ArchiveBucket createArchiveBucketFor(ZoneId zoneId);
 
+    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 66f753a6186..9e9492a982c 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
@@ -4,24 +4,24 @@ package com.yahoo.vespa.hosted.controller.api.integration.archive;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 
-import java.net.URI;
 import java.util.HashMap;
-import java.util.Optional;
 import java.util.Map;
 
 /**
  * @author freva
+ * @author andreer
  */
 public class MockArchiveService implements ArchiveService {
 
-    private final Map<ZoneId, Map<TenantName, URI>> archiveUris = new HashMap<>();
+    public Map<ArchiveBucket, Map<TenantName, String>> authorizedIamRoles = new HashMap<>();
 
     @Override
-    public Optional<URI> archiveUriFor(ZoneId zoneId, TenantName tenant) {
-        return Optional.ofNullable(archiveUris.get(zoneId)).map(uris -> uris.get(tenant));
+    public ArchiveBucket createArchiveBucketFor(ZoneId zoneId) {
+        return new ArchiveBucket("bucketName", "keyArn");
     }
 
-    public void setArchiveUri(ZoneId zone, TenantName tenantName, URI archiveUri) {
-        archiveUris.computeIfAbsent(zone, z -> new HashMap<>()).put(tenantName, archiveUri);
+    @Override
+    public void updateBucketAndKeyPolicy(ZoneId zoneId, ArchiveBucket bucket, Map<TenantName, String> authorizeIamRoleByTenantName) {
+        authorizedIamRoles.put(bucket, authorizeIamRoleByTenantName);
     }
 }