Throw the right exception instead

1 files changed, 4 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
index 062dc261194..63bfe871c76 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageValidator.java
@@ -123,7 +123,10 @@ public class ApplicationPackageValidator {
                                                        endpoint.regions().stream().sorted().toList());
                 }
             }
-            else { // Also covers unknown, future clouds. Expand above clauses when needed.
+            else if (clouds.size() == 1) {
+                throw new IllegalArgumentException("unknown cloud '" + clouds.iterator().next() + "'");
+            }
+            else {
                 throw new IllegalArgumentException(endpointString + " cannot contain regions in different clouds: " +
                                                    endpoint.regions().stream().sorted().toList());
             }