Risk and description can be specified for submissions

3 files changed, 18 insertions, 4 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 2860b8878b7..67cd7e1477e 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
@@ -418,6 +418,8 @@ public abstract class ControllerHttpClient {
         submission.sourceUrl().ifPresent(url -> rootObject.setString("sourceUrl", url));
         submission.authorEmail().ifPresent(email -> rootObject.setString("authorEmail", email));
         submission.projectId().ifPresent(projectId -> rootObject.setLong("projectId", projectId));
+        submission.risk().ifPresent(risk -> rootObject.setLong("risk", risk));
+        submission.description().ifPresent(description -> rootObject.setString("description", description));
         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 d3ebd715da8..173b4946d5a 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
@@ -20,10 +20,13 @@ public class Submission {
     private final Path applicationZip;
     private final Path applicationTestZip;
     private final Optional<Long> projectId;
+    private final Optional<Integer> risk;
+    private final Optional<String> description;
 
     public Submission(Optional<String> repository, Optional<String> branch, Optional<String> commit,
                       Optional<String> sourceUrl, Optional<String> authorEmail,
-                      Path applicationZip, Path applicationTestZip, Optional<Long> projectId) {
+                      Path applicationZip, Path applicationTestZip, Optional<Long> projectId,
+                      Optional<Integer> risk, Optional<String> description) {
         this.repository = repository;
         this.branch = branch;
         this.commit = commit;
@@ -32,6 +35,8 @@ public class Submission {
         this.applicationZip = applicationZip;
         this.applicationTestZip = applicationTestZip;
         this.projectId = projectId;
+        this.risk = risk;
+        this.description = description;
     }
 
     public Optional<String> repository() { return repository; }
@@ -42,5 +47,7 @@ public class Submission {
     public Path applicationZip() { return applicationZip; }
     public Path applicationTestZip() { return applicationTestZip; }
     public Optional<Long> projectId() { return projectId; }
+    public Optional<Integer> risk() { return risk; }
+    public Optional<String> description() { return description; }
 
 }
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 d2bad008003..f6ef17bc1b8 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,8 +6,6 @@ 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;
 
 /**
  * Submits a Vespa application package and corresponding test jars to the hosted Vespa API.
@@ -41,6 +39,12 @@ public class SubmitMojo extends AbstractVespaMojo {
     @Parameter(property = "projectId")
     private String projectId;
 
+    @Parameter(property = "risk")
+    private String risk;
+
+    @Parameter(property = "description")
+    private String description;
+
     @Override
     public void doExecute() {
         applicationZip = firstNonBlank(applicationZip, projectPathOf("target", "application.zip")).orElseThrow();
@@ -48,7 +52,8 @@ public class SubmitMojo extends AbstractVespaMojo {
         Submission submission = new Submission(optionalOf(repository), optionalOf(branch), optionalOf(commit),
                                                optionalOf(sourceUrl), optionalOf(authorEmail),
                                                Paths.get(applicationZip), Paths.get(applicationTestZip),
-                                               optionalOf(projectId, Long::parseLong));
+                                               optionalOf(projectId, Long::parseLong), optionalOf(risk, Integer::parseInt),
+                                               optionalOf(description));
 
         getLog().info(controller.submit(submission, id.tenant(), id.application()));
     }