Default to all declared prod zones for endpoints without regions

- Extract all production zones in the DeploymentSpec constructor and update all Endpoints instances without regions to these zones

- Add more tests to validate that this does what we want it to.

2 files changed, 29 insertions, 1 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index ada5ee23a7c..5b5f89fd8d1 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -74,11 +74,36 @@ public class DeploymentSpec {
         this.athenzDomain = athenzDomain;
         this.athenzService = athenzService;
         this.notifications = notifications;
-        this.endpoints = List.copyOf(Objects.requireNonNull(endpoints, "Missing endpoints parameter"));
+        this.endpoints = ImmutableList.copyOf(validateEndpoints(endpoints, this.steps));
         validateZones(this.steps);
         validateAthenz();
         validateEndpoints(this.steps, globalServiceId, this.endpoints);
     }
+
+    /** Validates the endpoints and makes sure default values are respected */
+    private List<Endpoint> validateEndpoints(List<Endpoint> endpoints, List<Step> steps) {
+        Objects.requireNonNull(endpoints, "Missing endpoints parameter");
+
+        var productionRegions = steps.stream()
+                .filter(step -> step.deploysTo(Environment.prod))
+                .flatMap(step -> step.zones().stream())
+                .flatMap(zone -> zone.region().stream())
+                .map(RegionName::value)
+                .collect(Collectors.toSet());
+
+        var rebuiltEndpointsList = new ArrayList<Endpoint>();
+
+        for (var endpoint : endpoints) {
+            if (endpoint.regions().isEmpty()) {
+                var rebuiltEndpoint = endpoint.withRegions(productionRegions);
+                rebuiltEndpointsList.add(rebuiltEndpoint);
+            } else {
+                rebuiltEndpointsList.add(endpoint);
+            }
+        }
+
+        return ImmutableList.copyOf(rebuiltEndpointsList);
+    }
     
     /** Throw an IllegalArgumentException if the total delay exceeds 24 hours */
     private void validateTotalDelay(List<Step> steps) {
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 158fbfb175f..e47dcd78219 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
@@ -75,4 +75,7 @@ public class Endpoint {
         return Objects.hash(endpointId, containerId, regions);
     }
 
+    public Endpoint withRegions(Set<String> regions) {
+        return new Endpoint(endpointId, containerId, regions);
+    }
 }