Enforce active no requirements

1 files changed, 11 insertions, 4 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index 09496b88aeb..1a9fc09d176 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -90,10 +90,12 @@ public class NodeSpec {
             NodeReports reports,
             Optional<String> parentHostname) {
         if (state == NodeState.active) {
-            Objects.requireNonNull(wantedVespaVersion, "Unknown vespa version for active node");
-            Objects.requireNonNull(wantedDockerImage, "Unknown docker image for active node");
-            Objects.requireNonNull(wantedRestartGeneration, "Unknown restartGeneration for active node");
-            Objects.requireNonNull(currentRestartGeneration, "Unknown currentRestartGeneration for active node");
+            requireOptional(owner, "owner");
+            requireOptional(membership, "membership");
+            requireOptional(wantedVespaVersion, "wantedVespaVersion");
+            requireOptional(wantedDockerImage, "wantedDockerImage");
+            requireOptional(wantedRestartGeneration, "restartGeneration");
+            requireOptional(currentRestartGeneration, "currentRestartGeneration");
         }
 
         this.hostname = Objects.requireNonNull(hostname);
@@ -713,4 +715,9 @@ public class NodeSpec {
             return builder;
         }
     }
+
+    private static void requireOptional(Optional<?> optional, String name) {
+        if (optional == null || optional.isEmpty())
+            throw new IllegalArgumentException(name + " must be set, was " + optional);
+    }
 }