accept callback_url

Author: sgalpha01

src/main/java/uk/ac/ebi/tsc/tesk/k8s/constant/Constants.java

@@ -25,7 +25,7 @@ public class Constants {
      * Key in JSON taskmaster input, which holds list of executors
      */
     public static final String TASKMASTER_INPUT_EXEC_KEY = "executors";
-
+    
     /**
      *
      */
@@ -69,6 +69,11 @@ public class Constants {
      */
     public static final String ANN_JSON_INPUT_KEY = "json-input";
 
+    /**
+     * Key of the annotation, that stores the callback URL
+     */
+    public static final String ANN_CALLBACK_URL_KEY = "callback_url";
+
     /**
      * Key of the label, that stores taskmaster's name (==TES task generated ID) in executor jobs
      */

src/main/java/uk/ac/ebi/tsc/tesk/k8s/convert/TesKubernetesConverter.java

@@ -75,6 +75,10 @@ public V1Job fromTesTaskToK8sJob(TesTask task, User user) {
         V1Job taskMasterJob = this.taskmasterTemplateSupplier.get();
         //put input task name as annotation
         taskMasterJob.getMetadata().putAnnotationsItem(ANN_TESTASK_NAME_KEY, task.getName());
+        // put callback URL as annotation
+        if (task.getCallbackUrl() != null) {
+            taskMasterJob.getMetadata().putAnnotationsItem(ANN_CALLBACK_URL_KEY, task.getCallbackUrl());
+        }
         //creating user and owning group
         taskMasterJob.getMetadata().putLabelsItem(LABEL_USERID_KEY, user.getUsername());
         if (task.getTags() != null && task.getTags().containsKey("GROUP_NAME")) {

src/main/java/uk/ac/ebi/tsc/tesk/tes/model/TesTask.java

@@ -32,6 +32,9 @@ public class TesTask   {
   @JsonProperty("description")
   private String description;
 
+  @JsonProperty("callback_url")
+  private String callbackUrl;
+
   @JsonProperty("inputs")
   @Valid
   private List<TesInput> inputs = null;
@@ -144,6 +147,26 @@ public void setDescription(String description) {
     this.description = description;
   }
 
+  public TesTask callbackUrl(String callbackUrl) {
+    this.callbackUrl = callbackUrl;
+    return this;
+  }
+
+  /**
+   * Optional user-provided callback URL.
+   * @return callbackUrl
+   */
+  @ApiModelProperty(value = "Optional user-provided callback URL.")
+
+
+  public String getCallbackUrl() {
+    return callbackUrl;
+  }
+
+  public void setCallbackUrl(String callbackUrl) {
+    this.callbackUrl = callbackUrl;
+  }
+
   public TesTask inputs(List<TesInput> inputs) {
     this.inputs = inputs;
     return this;
@@ -372,6 +395,7 @@ public boolean equals(Object o) {
         Objects.equals(this.state, tesTask.state) &&
         Objects.equals(this.name, tesTask.name) &&
         Objects.equals(this.description, tesTask.description) &&
+        Objects.equals(this.callbackUrl, tesTask.callbackUrl) &&
         Objects.equals(this.inputs, tesTask.inputs) &&
         Objects.equals(this.outputs, tesTask.outputs) &&
         Objects.equals(this.resources, tesTask.resources) &&
@@ -384,7 +408,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, state, name, description, inputs, outputs, resources, executors, volumes, tags, logs, creationTime);
+    return Objects.hash(id, state, name, description, callbackUrl, inputs, outputs, resources, executors, volumes, tags, logs, creationTime);
   }
 
   @Override
@@ -396,6 +420,7 @@ public String toString() {
     sb.append("    state: ").append(toIndentedString(state)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    description: ").append(toIndentedString(description)).append("\n");
+    sb.append("    callbackUrl: ").append(toIndentedString(callbackUrl)).append("\n");
     sb.append("    inputs: ").append(toIndentedString(inputs)).append("\n");
     sb.append("    outputs: ").append(toIndentedString(outputs)).append("\n");
     sb.append("    resources: ").append(toIndentedString(resources)).append("\n");