Overrides for run now requests

SingularityBase/src/main/java/com/hubspot/singularity/SingularityPendingTask.java

@@ -1,6 +1,8 @@
 package com.hubspot.singularity;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
@@ -20,6 +22,7 @@ public class SingularityPendingTask {
   private final Optional<Boolean> skipHealthchecks;
   private final Optional<String> message;
   private final Optional<Resources> resources;
+  private final Map<String, String> envOverrides;
   private final Optional<String> actionId;
 
   public static Predicate<SingularityPendingTask> matchingRequest(final String requestId) {
@@ -45,16 +48,24 @@ public boolean apply(@Nonnull SingularityPendingTask input) {
   }
 
   @JsonCreator
-  public SingularityPendingTask(@JsonProperty("pendingTaskId") SingularityPendingTaskId pendingTaskId, @JsonProperty("cmdLineArgsList") Optional<List<String>> cmdLineArgsList,
-      @JsonProperty("user") Optional<String> user, @JsonProperty("runId") Optional<String> runId, @JsonProperty("skipHealthchecks") Optional<Boolean> skipHealthchecks,
-      @JsonProperty("message") Optional<String> message, @JsonProperty("resources") Optional<Resources> resources, @JsonProperty("actionId") Optional<String> actionId) {
+  public SingularityPendingTask(
+      @JsonProperty("pendingTaskId") SingularityPendingTaskId pendingTaskId,
+      @JsonProperty("cmdLineArgsList") Optional<List<String>> cmdLineArgsList,
+      @JsonProperty("user") Optional<String> user,
+      @JsonProperty("runId") Optional<String> runId,
+      @JsonProperty("skipHealthchecks") Optional<Boolean> skipHealthchecks,
+      @JsonProperty("message") Optional<String> message,
+      @JsonProperty("resources") Optional<Resources> resources,
+      @JsonProperty("envOverrides") Map<String, String> envOverrides,
+      @JsonProperty("actionId") Optional<String> actionId) {
     this.pendingTaskId = pendingTaskId;
     this.user = user;
     this.message = message;
     this.cmdLineArgsList = cmdLineArgsList;
     this.runId = runId;
     this.skipHealthchecks = skipHealthchecks;
     this.resources = resources;
+    this.envOverrides = envOverrides == null ? Collections.emptyMap() : envOverrides;
     this.actionId = actionId;
   }
 
@@ -103,6 +114,8 @@ public Optional<Resources> getResources() {
     return resources;
   }
 
+  public Map<String, String> getEnvOverrides() { return envOverrides; }
+
   public Optional<String> getActionId() {
     return actionId;
   }
@@ -117,6 +130,7 @@ public String toString() {
         ", skipHealthchecks=" + skipHealthchecks +
         ", message=" + message +
         ", resources=" + resources +
+        ", envOverrides=" + envOverrides +
         ", actionId=" + actionId +
         '}';
   }

SingularityBase/src/main/java/com/hubspot/singularity/SingularityPendingTaskBuilder.java

@@ -0,0 +1,90 @@
+package com.hubspot.singularity;
+
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Optional;
+import com.hubspot.mesos.Resources;
+
+public class SingularityPendingTaskBuilder {
+
+  private SingularityPendingTaskId pendingTaskId;
+  private Optional<List<String>> cmdLineArgsList;
+  private Optional<String> user;
+  private Optional<String> runId;
+  private Optional<Boolean> skipHealthchecks;
+  private Optional<String> message;
+  private Optional<Resources> resources;
+  private Map<String, String> envOverrides;
+  private Optional<String> actionId;
+
+  public SingularityPendingTaskBuilder() {
+    this.pendingTaskId = null;
+    this.cmdLineArgsList = Optional.absent();
+    this.user = Optional.absent();
+    this.runId = Optional.absent();
+    this.skipHealthchecks = Optional.absent();
+    this.message = Optional.absent();
+    this.resources = Optional.absent();
+    this.envOverrides = null;
+    this.actionId = Optional.absent();
+  }
+
+  public SingularityPendingTaskBuilder setPendingTaskId(SingularityPendingTaskId pendingTaskId) {
+    this.pendingTaskId = pendingTaskId;
+    return this;
+  }
+
+
+  public SingularityPendingTaskBuilder setCmdLineArgsList(List<String> cmdLineArgsList) {
+    this.cmdLineArgsList = Optional.of(cmdLineArgsList);
+    return this;
+  }
+
+  public SingularityPendingTaskBuilder setCmdLineArgsList(Optional<List<String>> cmdLineArgsList) {
+    this.cmdLineArgsList = cmdLineArgsList;
+    return this;
+  }
+
+  public SingularityPendingTaskBuilder setUser(String user) {
+    this.user = Optional.of(user);
+    return this;
+  }
+
+
+  public SingularityPendingTaskBuilder setRunId(String runId) {
+    this.runId = Optional.of(runId);
+    return this;
+  }
+
+  public SingularityPendingTaskBuilder setSkipHealthchecks(Boolean skipHealthchecks) {
+    this.skipHealthchecks = Optional.of(skipHealthchecks);
+    return this;
+  }
+
+  public SingularityPendingTaskBuilder setMessage(String message) {
+    this.message = Optional.of(message);
+    return this;
+  }
+
+  public SingularityPendingTaskBuilder setResources(Resources resources) {
+    this.resources = Optional.of(resources);
+    return this;
+  }
+
+  public SingularityPendingTaskBuilder setEnvOverrides(Map<String, String> envOverrides) {
+    this.envOverrides = envOverrides;
+    return this;
+  }
+  public SingularityPendingTaskBuilder setActionId(String actionId) {
+    this.actionId = Optional.of(actionId);
+    return this;
+  }
+
+  public SingularityPendingTask build() {
+    return new SingularityPendingTask(
+        pendingTaskId, cmdLineArgsList, user, runId, skipHealthchecks, message, resources, envOverrides, actionId
+    );
+  }
+
+}

SingularityBase/src/main/java/com/hubspot/singularity/SingularityRunNowRequestBuilder.java

@@ -0,0 +1,70 @@
+package com.hubspot.singularity;
+
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Optional;
+import com.hubspot.mesos.Resources;
+import com.hubspot.singularity.api.SingularityRunNowRequest;
+
+public class SingularityRunNowRequestBuilder {
+  private Optional<String> message;
+  private Optional<String> runId;
+  private Optional<List<String>> commandLineArgs;
+  private Optional<Boolean> skipHealthchecks;
+  private Optional<Resources> resources;
+  private Map<String, String> envOverrides;
+  private Optional<Long> runAt;
+
+  public SingularityRunNowRequestBuilder()
+  {
+    this.message = Optional.absent();
+    this.runId = Optional.absent();
+    this.commandLineArgs = Optional.absent();
+    this.skipHealthchecks = Optional.absent();
+    this.resources = Optional.absent();
+    this.envOverrides = null;
+    this.runAt = Optional.absent();
+  }
+
+  public SingularityRunNowRequestBuilder setMessage(String message) {
+    this.message = Optional.of(message);
+    return this;
+  }
+
+  public SingularityRunNowRequestBuilder setRunId(String runId) {
+    this.runId = Optional.of(runId);
+    return this;
+  }
+
+  public SingularityRunNowRequestBuilder setCommandLineArgs(List<String> commandLineArgs) {
+    this.commandLineArgs = Optional.of(commandLineArgs);
+    return this;
+  }
+
+  public SingularityRunNowRequestBuilder setSkipHealthchecks(Boolean skipHealthchecks) {
+    this.skipHealthchecks = Optional.of(skipHealthchecks);
+    return this;
+  }
+
+  public SingularityRunNowRequestBuilder setResources(Resources resources) {
+    this.resources = Optional.of(resources);
+    return this;
+  }
+
+  public SingularityRunNowRequestBuilder setEnvOverrides(Map<String, String> environmentVariables) {
+    this.envOverrides = environmentVariables;
+    return this;
+  }
+
+  public SingularityRunNowRequestBuilder setRunAt(Long runAt) {
+    this.runAt = Optional.of(runAt);
+    return this;
+  }
+
+  public SingularityRunNowRequest build() {
+    return new SingularityRunNowRequest(
+        message, skipHealthchecks, runId, commandLineArgs, resources, envOverrides, runAt);
+  }
+
+}

SingularityBase/src/main/java/com/hubspot/singularity/api/SingularityRunNowRequest.java

@@ -1,6 +1,8 @@
 package com.hubspot.singularity.api;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -15,34 +17,38 @@ public class SingularityRunNowRequest {
   private final Optional<List<String>> commandLineArgs;
   private final Optional<Boolean> skipHealthchecks;
   private final Optional<Resources> resources;
+  private final Map<String, String> envOverrides;
   private final Optional<Long> runAt;
 
   public SingularityRunNowRequest(
       Optional<String> message,
       Optional<Boolean> skipHealthchecks,
       Optional<String> runId,
       Optional<List<String>> commandLineArgs,
-      Optional<Resources> resources
+      Optional<Resources> resources,
+      Map<String, String> envOverrides
   ) {
-    this(message, skipHealthchecks, runId, commandLineArgs, resources, Optional.<Long>absent());
+    this(message, skipHealthchecks, runId, commandLineArgs, resources, envOverrides, Optional.<Long>absent());
   }
 
   @JsonCreator
-  public SingularityRunNowRequest(@JsonProperty("message") Optional<String> message,
-                                  @JsonProperty("skipHealthchecks") Optional<Boolean> skipHealthchecks,
-                                  @JsonProperty("runId") Optional<String> runId,
-                                  @JsonProperty("commandLineArgs") Optional<List<String>> commandLineArgs,
+  public SingularityRunNowRequest(@JsonProperty("setMessage") Optional<String> message,
+                                  @JsonProperty("setSkipHealthchecks") Optional<Boolean> skipHealthchecks,
+                                  @JsonProperty("setRunId") Optional<String> runId,
+                                  @JsonProperty("setCommandLineArgs") Optional<List<String>> commandLineArgs,
                                   @JsonProperty("resources") Optional<Resources> resources,
-                                  @JsonProperty("runAt") Optional<Long> runAt) {
+                                  @JsonProperty("setEnvOverrides") Map<String, String> envOverrides,
+                                  @JsonProperty("setRunAt") Optional<Long> runAt) {
     this.message = message;
     this.commandLineArgs = commandLineArgs;
     this.runId = runId;
     this.skipHealthchecks = skipHealthchecks;
     this.resources = resources;
+    this.envOverrides = envOverrides == null ? Collections.emptyMap() : envOverrides;
     this.runAt = runAt;
   }
 
-  @ApiModelProperty(required=false, value="A message to show to users about why this action was taken")
+  @ApiModelProperty(required=false, value="A setMessage to show to users about why this action was taken")
   public Optional<String> getMessage() {
     return message;
   }
@@ -62,11 +68,16 @@ public Optional<Boolean> getSkipHealthchecks() {
     return skipHealthchecks;
   }
 
-  @ApiModelProperty(required=false, value="Override the resources from the active deploy for this run")
+  @ApiModelProperty(required=false, value="Override the setResources from the active deploy for this run")
   public Optional<Resources> getResources() {
     return resources;
   }
 
+  @ApiModelProperty(required=false, value="Override the environment variables for launched tasks")
+  public Map<String, String> getEnvOverrides() {
+    return envOverrides;
+  }
+
   @ApiModelProperty(required=false, value="Schedule this task to run at a specified time")
   public Optional<Long> getRunAt() {
     return runAt;
@@ -80,6 +91,7 @@ public String toString() {
         ", commandLineArgs=" + commandLineArgs +
         ", skipHealthchecks=" + skipHealthchecks +
         ", resources=" + resources +
+        ", envOverrides=" + envOverrides +
         ", runAt=" + runAt +
         '}';
   }

SingularityService/src/main/java/com/hubspot/singularity/data/SingularityValidator.java

@@ -448,6 +448,7 @@ private SingularityRunNowRequest fillRunNowRequest(Optional<SingularityRunNowReq
           Optional.of(getRunId(request.getRunId())),
           request.getCommandLineArgs(),
           request.getResources(),
+          request.getEnvOverrides(),
           request.getRunAt());
     } else {
       return new SingularityRunNowRequest(
@@ -456,7 +457,7 @@ private SingularityRunNowRequest fillRunNowRequest(Optional<SingularityRunNowReq
           Optional.of(getRunId(Optional.absent())),
           Optional.absent(),
           Optional.absent(),
-          Optional.absent());
+          null);
     }
   }
 

SingularityService/src/main/java/com/hubspot/singularity/data/zkmigrations/SingularityCmdLineArgsMigration.java

@@ -16,11 +16,10 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.inject.Inject;
-import com.hubspot.mesos.Resources;
 import com.hubspot.singularity.SingularityCreateResult;
 import com.hubspot.singularity.SingularityPendingRequest;
 import com.hubspot.singularity.SingularityPendingRequest.PendingType;
-import com.hubspot.singularity.SingularityPendingTask;
+import com.hubspot.singularity.SingularityPendingTaskBuilder;
 import com.hubspot.singularity.SingularityPendingTaskId;
 import com.hubspot.singularity.data.TaskManager;
 import com.hubspot.singularity.data.transcoders.StringTranscoder;
@@ -142,8 +141,12 @@ private void checkPendingTasks() {
       for (SingularityPendingTaskId pendingTaskId : taskManager.getPendingTaskIds()) {
         Optional<String> cmdLineArgs = getCmdLineArgs(pendingTaskId);
 
-        SingularityCreateResult result = taskManager.savePendingTask(new SingularityPendingTask(pendingTaskId, getCmdLineArgs(cmdLineArgs), Optional.<String> absent(),
-            Optional.<String> absent(), Optional.<Boolean> absent(), Optional.<String> absent(), Optional.<Resources>absent(), Optional.<String>absent()));
+        SingularityCreateResult result = taskManager.savePendingTask(
+            new SingularityPendingTaskBuilder()
+                .setPendingTaskId(pendingTaskId)
+                .setCmdLineArgsList(getCmdLineArgs(cmdLineArgs))
+                .build()
+        );
 
         LOG.info("Saving {} ({}) {}", pendingTaskId, cmdLineArgs, result);
       }

SingularityService/src/main/java/com/hubspot/singularity/data/zkmigrations/SingularityPendingTaskIdMigration.java

@@ -14,10 +14,9 @@
 import com.google.common.base.Throwables;
 import com.google.inject.Inject;
 import com.hubspot.mesos.JavaUtils;
-import com.hubspot.mesos.Resources;
 import com.hubspot.singularity.InvalidSingularityTaskIdException;
 import com.hubspot.singularity.SingularityPendingRequest.PendingType;
-import com.hubspot.singularity.SingularityPendingTask;
+import com.hubspot.singularity.SingularityPendingTaskBuilder;
 import com.hubspot.singularity.SingularityPendingTaskId;
 import com.hubspot.singularity.data.TaskManager;
 import com.hubspot.singularity.data.transcoders.StringTranscoder;
@@ -59,8 +58,11 @@ public void applyMigration() {
 
           Optional<String> cmdLineArgs = getCmdLineArgs(pendingTaskId);
 
-          taskManager.savePendingTask(new SingularityPendingTask(newPendingTaskId, cmdLineArgs.isPresent() ? Optional.of(Collections.singletonList(cmdLineArgs.get())) :
-            Optional.<List<String>> absent(), Optional.<String> absent(), Optional.<String> absent(), Optional.<Boolean> absent(), Optional.<String> absent(), Optional.<Resources>absent(), Optional.<String>absent()));
+          taskManager.savePendingTask(
+              new SingularityPendingTaskBuilder()
+                  .setPendingTaskId(newPendingTaskId)
+                  .setCmdLineArgsList(cmdLineArgs.isPresent() ? Optional.of(Collections.singletonList(cmdLineArgs.get())) : Optional.<List<String>> absent())
+                  .build());
 
           curator.delete().forPath(ZKPaths.makePath(PENDING_TASKS_ROOT, pendingTaskId));
         }