Expose system as zone through ZoneRegistry

1 files changed, 5 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
index 1bb3b1c5de8..8b5280a0e8c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java
@@ -31,17 +31,18 @@ import java.util.stream.Stream;
 @SuppressWarnings("unused")
 public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
 
-    private static final ZoneId CONTROLLER_ZONE = ZoneId.from("prod", "controller");
     private static final URI CONTROLLER_URI = URI.create("https://localhost:4443/");
     private static final List<String> WHITELISTED_APIS = List.of("/flags/v1/", "/nodes/v2/", "/orchestrator/v1/");
 
     private final ZoneRegistry zoneRegistry;
     private final ConfigServerRestExecutor proxy;
+    private final ZoneId controllerZone;
 
     public ConfigServerApiHandler(Context parentCtx, ServiceRegistry serviceRegistry,
                                   ConfigServerRestExecutor proxy, Controller controller) {
         super(parentCtx, controller.auditLogger());
         this.zoneRegistry = serviceRegistry.zoneRegistry();
+        this.controllerZone = zoneRegistry.systemZone().getVirtualId();
         this.proxy = proxy;
     }
 
@@ -83,7 +84,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
         }
 
         ZoneId zoneId = ZoneId.from(path.get("environment"), path.get("region"));
-        if (! zoneRegistry.hasZone(zoneId) && ! CONTROLLER_ZONE.equals(zoneId)) {
+        if (! zoneRegistry.hasZone(zoneId) && ! controllerZone.equals(zoneId)) {
             throw new IllegalArgumentException("No such zone: " + zoneId.value());
         }
 
@@ -102,7 +103,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
         ZoneList zoneList = zoneRegistry.zones().reachable();
 
         Cursor zones = root.setArray("zones");
-        Stream.concat(Stream.of(CONTROLLER_ZONE), zoneRegistry.zones().reachable().ids().stream())
+        Stream.concat(Stream.of(controllerZone), zoneRegistry.zones().reachable().ids().stream())
                 .forEach(zone -> {
             Cursor object = zones.addObject();
             object.setString("environment", zone.environment().value());
@@ -118,7 +119,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler {
     }
 
     private URI getEndpoint(ZoneId zoneId) {
-        return CONTROLLER_ZONE.equals(zoneId) ? CONTROLLER_URI : zoneRegistry.getConfigServerVipUri(zoneId);
+        return controllerZone.equals(zoneId) ? CONTROLLER_URI : zoneRegistry.getConfigServerVipUri(zoneId);
     }
 
 }