Merge pull request #11857 from vespa-engine/jvenstad/optional-submission-data

Require scheme and host as well

2 files changed, 5 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
index 685eed22699..bbe533db9b5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
@@ -51,8 +51,6 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
         if (commit.isPresent() && commit.get().length() > 128)
             throw new IllegalArgumentException("Commit may not be longer than 128 characters");
 
-        sourceUrl.map(URI::create);
-
         if (authorEmail.isPresent() && ! authorEmail.get().matches("[^@]+@[^@]+"))
             throw new IllegalArgumentException("Invalid author email '" + authorEmail.get() + "'.");
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 0c0b1f67b90..6db665ae143 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -1998,6 +1998,11 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         Optional<String> sourceUrl = optional("sourceUrl", submitOptions);
         Optional<String> authorEmail = optional("authorEmail", submitOptions);
 
+        sourceUrl.map(URI::create).ifPresent(url -> {
+            if (url.getHost() == null || url.getScheme() == null)
+                throw new IllegalArgumentException("Source URL must include scheme and host");
+        });
+
         ApplicationPackage applicationPackage = new ApplicationPackage(dataParts.get(EnvironmentResource.APPLICATION_ZIP), true);
 
         controller.applications().verifyApplicationIdentityConfiguration(TenantName.from(tenant),