Revert "Revert "Maintain archive access for controller" MERGEOK"

1 files changed, 6 insertions, 4 deletions

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 df2b462914e..e73d66b0329 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,6 +17,7 @@ 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;
@@ -48,10 +49,11 @@ public class ArchiveAccessMaintainerTest {
         assertEquals(Set.of(tenant1role), archiveService.authorizedIamRolesForKey.get(testBucket.keyArn()));
 
         var expected = Map.of("archive.bucketCount",
-                tester.controller().zoneRegistry().zones().all().ids().stream()
-                        .collect(Collectors.toMap(
-                                zone -> Map.of("zone", zone.value()),
-                                zone -> zone.equals(testZone) ? 1d : 0d)));
+                              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)));
 
         assertEquals(expected, metric.metrics());
     }