Revert "Maintain archive access for controller"

2 files changed, 10 insertions, 15 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
index 0c2324d1a0d..e3f69f59d24 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainer.java
@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.groupingBy;
 
@@ -47,15 +46,13 @@ public class ArchiveAccessMaintainer extends ControllerMaintainer {
     @Override
     protected double maintain() {
         // Count buckets - so we can alert if we get close to the account limit of 1000
-        Stream.concat(Stream.of(zoneRegistry.systemZone().getVirtualId()),
-                      zoneRegistry.zones().all().ids().stream())
-              .forEach(zoneId -> metric.set(bucketCountMetricName, archiveBucketDb.buckets(zoneId).size(),
-                                            metric.createContext(Map.of("zone", zoneId.value()))));
+        zoneRegistry.zones().all().ids().forEach(zoneId ->
+                metric.set(bucketCountMetricName, archiveBucketDb.buckets(zoneId).size(),
+                        metric.createContext(Map.of("zone", zoneId.value()))));
 
-        Stream.concat(Stream.of(zoneRegistry.systemZone()),
-                      zoneRegistry.zones().controllerUpgraded().zones().stream())
-              .forEach(z -> {
-                    ZoneId zoneId = z.getVirtualId();
+
+        zoneRegistry.zones().controllerUpgraded().zones().forEach(z -> {
+                    ZoneId zoneId = z.getId();
                     try {
                         var tenantArchiveAccessRoles = cloudTenantArchiveExternalAccessRoles();
                         archiveBucketDb.buckets(zoneId).forEach(archiveBucket ->
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
index e73d66b0329..df2b462914e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
@@ -17,7 +17,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -49,11 +48,10 @@ public class ArchiveAccessMaintainerTest {
         assertEquals(Set.of(tenant1role), archiveService.authorizedIamRolesForKey.get(testBucket.keyArn()));
 
         var expected = Map.of("archive.bucketCount",
-                              Stream.concat(Stream.of(tester.controller().zoneRegistry().systemZone().getVirtualId()),
-                                            tester.controller().zoneRegistry().zones().all().ids().stream())
-                                    .collect(Collectors.toMap(
-                                            zone -> Map.of("zone", zone.value()),
-                                            zone -> zone.equals(testZone) ? 1d : 0d)));
+                tester.controller().zoneRegistry().zones().all().ids().stream()
+                        .collect(Collectors.toMap(
+                                zone -> Map.of("zone", zone.value()),
+                                zone -> zone.equals(testZone) ? 1d : 0d)));
 
         assertEquals(expected, metric.metrics());
     }