Require validation override for destructive endpoint changes

2 files changed, 11 insertions, 3 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java b/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java
index e47dcd78219..99cb07f3104 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java
@@ -60,6 +60,10 @@ public class Endpoint {
         return regions;
     }
 
+    public Endpoint withRegions(Set<String> regions) {
+        return new Endpoint(endpointId, containerId, regions);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -75,7 +79,10 @@ public class Endpoint {
         return Objects.hash(endpointId, containerId, regions);
     }
 
-    public Endpoint withRegions(Set<String> regions) {
-        return new Endpoint(endpointId, containerId, regions);
+    @Override
+    public String toString() {
+        return "endpoint '" + endpointId() + "' (cluster " + containerId + ") -> " +
+               regions.stream().map(RegionName::value).sorted().collect(Collectors.joining(", "));
     }
+
 }
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
index 65dc264eb8a..35ece71a72e 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ValidationId.java
@@ -22,7 +22,8 @@ public enum ValidationId {
     configModelVersionMismatch("config-model-version-mismatch"), // Internal use
     skipOldConfigModels("skip-old-config-models"), // Internal use
     forceAutomaticTenantUpgradeTests("force-automatic-tenant-upgrade-test"), // Internal use
-    accessControl("access-control"); // Internal use, used in zones where there should be no access-control
+    accessControl("access-control"), // Internal use, used in zones where there should be no access-control
+    globalEndpointChange("global-endpoint-change"); // Changing global endpoints
 
     private final String id;