Set commit and sourceUrl fields when present, in submit mojo

3 files changed, 12 insertions, 2 deletions

diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
index c5626f7d690..4559deddeda 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
@@ -291,6 +291,7 @@ public abstract class ControllerHttpClient {
         rootObject.setString("repository", submission.repository());
         rootObject.setString("branch", submission.branch());
         rootObject.setString("commit", submission.commit());
+        submission.sourceUrl().ifPresent(url -> rootObject.setString("sourceUrl", url));
         rootObject.setString("authorEmail", submission.authorEmail());
         submission.projectId().ifPresent(projectId -> rootObject.setLong("projectId", projectId));
         return toJson(slime);
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java b/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java
index fe2dbaf977e..6f392de86e7 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/Submission.java
@@ -2,6 +2,7 @@
 package ai.vespa.hosted.api;
 
 import java.nio.file.Path;
+import java.util.Optional;
 import java.util.OptionalLong;
 
 /**
@@ -14,15 +15,18 @@ public class Submission {
     private final String repository;
     private final String branch;
     private final String commit;
+    private final Optional<String> sourceUrl;
     private final String authorEmail;
     private final Path applicationZip;
     private final Path applicationTestZip;
     private final OptionalLong projectId;
 
-    public Submission(String repository, String branch, String commit, String authorEmail, Path applicationZip, Path applicationTestZip, OptionalLong projectId) {
+    public Submission(String repository, String branch, String commit, Optional<String> sourceUrl, String authorEmail,
+                      Path applicationZip, Path applicationTestZip, OptionalLong projectId) {
         this.repository = repository;
         this.branch = branch;
         this.commit = commit;
+        this.sourceUrl = sourceUrl;
         this.authorEmail = authorEmail;
         this.applicationZip = applicationZip;
         this.applicationTestZip = applicationTestZip;
@@ -32,6 +36,7 @@ public class Submission {
     public String repository() { return repository; }
     public String branch() { return branch; }
     public String commit() { return commit; }
+    public Optional<String> sourceUrl() { return sourceUrl; }
     public String authorEmail() { return authorEmail; }
     public Path applicationZip() { return applicationZip; }
     public Path applicationTestZip() { return applicationTestZip; }
diff --git a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java
index 3aee3a5ce96..80655cf1d36 100644
--- a/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java
+++ b/vespa-maven-plugin/src/main/java/ai/vespa/hosted/plugin/SubmitMojo.java
@@ -6,6 +6,7 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 
 import java.nio.file.Paths;
+import java.util.Optional;
 import java.util.OptionalLong;
 
 /**
@@ -34,6 +35,9 @@ public class SubmitMojo extends AbstractVespaMojo {
     @Parameter(property = "commit", defaultValue = "unknown")
     private String commit;
 
+    @Parameter(property = "sourceUrl")
+    private String sourceUrl;
+
     @Parameter(property = "projectId")
     private Long projectId;
 
@@ -41,7 +45,7 @@ public class SubmitMojo extends AbstractVespaMojo {
     public void doExecute() {
         applicationZip = firstNonBlank(applicationZip, projectPathOf("target", "application.zip"));
         applicationTestZip = firstNonBlank(applicationTestZip, projectPathOf("target", "application-test.zip"));
-        Submission submission = new Submission(repository, branch, commit, authorEmail,
+        Submission submission = new Submission(repository, branch, commit, Optional.ofNullable(sourceUrl), authorEmail,
                                                Paths.get(applicationZip),
                                                Paths.get(applicationTestZip),
                                                projectId == null ? OptionalLong.empty() : OptionalLong.of(projectId));