Smarter window change handling

2 files changed, 7 insertions, 2 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
index 3c7a14b9496..f723575c342 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
@@ -72,7 +72,12 @@ public final class Capacity {
 
     /** Create a non-required, failable capacity request */
     public static Capacity from(ClusterResources resources) {
-        return from(resources, false, true);
+        return from(resources, resources);
+    }
+
+    /** Create a non-required, failable capacity request */
+    public static Capacity from(ClusterResources min, ClusterResources max) {
+        return from(min, max, false, true);
     }
 
     public static Capacity from(ClusterResources resources, boolean required, boolean canFail) {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 97549e851ad..3a230c89732 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -29,7 +29,7 @@ public final class ClusterSpec {
         this.type = type;
         this.id = id;
         this.groupId = groupId;
-        this.vespaVersion = vespaVersion;
+        this.vespaVersion = Objects.requireNonNull(vespaVersion);
         this.exclusive = exclusive;
         // TODO(mpolden): Require combinedId to always be present for type combined after April 2020
         if (type != Type.combined && combinedId.isPresent()) {