Remove hardcoding, use feature flag when deciding to use config sever VIP

2 files changed, 4 insertions, 6 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java
index 36a46f72d34..4a245fb3555 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java
@@ -116,11 +116,9 @@ public class ZoneApiHandler extends AuditLoggingRequestHandler {
         boolean useConfigServerVip = Flags.USE_CONFIG_SERVER_VIP.bindTo(flagSource)
                 .with(FetchVector.Dimension.ZONE_ID, zoneId.value()).value();
 
-        // TODO: Still need to hardcode AWS since flag cannot be set until flag has been rolled out
-        if (zoneId.region().value().startsWith("aws-") || useConfigServerVip) {
-            return ProxyRequest.tryOne(zoneRegistry.getConfigServerVipUri(zoneId), path, request);
-        }
-        return ProxyRequest.tryAll(zoneRegistry.getConfigServerUris(zoneId), path, request);
+        return useConfigServerVip
+                ? ProxyRequest.tryOne(zoneRegistry.getConfigServerVipUri(zoneId), path, request)
+                : ProxyRequest.tryAll(zoneRegistry.getConfigServerUris(zoneId), path, request);
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
index a7adac7f89d..61915860d7c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
@@ -81,7 +81,7 @@ public class ZoneApiTest extends ControllerContainerTest {
         tester.assertResponse(operatorRequest("http://localhost:8080/zone/v2/dev/aws-us-north-2/nodes/v2/node/node1",
                                                             "{\"currentRestartGeneration\": 1}",
                                                             Method.PATCH), "ok");
-        assertLastRequest(ZoneId.from("dev", "aws-us-north-2"), 1, "PATCH");
+        assertLastRequest(ZoneId.from("dev", "aws-us-north-2"), 2, "PATCH");
         assertEquals("{\"currentRestartGeneration\": 1}", proxy.lastRequestBody().get());
 
         assertFalse("Actions are logged to audit log", tester.controller().auditLogger().readLog().entries().isEmpty());