From 255a8999ba798906ae0a4a28a8c4f6d576658577 Mon Sep 17 00:00:00 2001
From: Stephen Salinas <ssalinas@hubspot.com>
Date: Wed, 18 Nov 2015 10:28:42 -0500
Subject: [PATCH] rename to task-pid and runAsTaskUser

---
 .../config/SingularityExecutorConfiguration.java       |  2 +-
 .../SingularityExecutorShellCommandDescriptor.java     | 10 +++++-----
 .../shells/SingularityExecutorShellCommandRunner.java  |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java
index a79f749a74..5911da5db9 100644
--- a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java
+++ b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/config/SingularityExecutorConfiguration.java
@@ -248,7 +248,7 @@ public class SingularityExecutorConfiguration extends BaseRunnerConfiguration {
   private String shellCommandUserPlaceholder = "{USER}";
 
   @JsonProperty
-  private String shellCommandPidFile = ".shell_command_pid";
+  private String shellCommandPidFile = ".task-pid";
 
   public SingularityExecutorConfiguration() {
     super(Optional.of("singularity-executor.log"));
diff --git a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandDescriptor.java b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandDescriptor.java
index d8e28590e7..20f2d676c5 100644
--- a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandDescriptor.java
+++ b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandDescriptor.java
@@ -26,7 +26,7 @@ public class SingularityExecutorShellCommandDescriptor {
 
   @JsonProperty
   @NotNull
-  private boolean switchUser = true;
+  private boolean runAsTaskUser = true;
 
   public List<SingularityExecutorShellCommandOptionDescriptor> getOptions() {
     return options;
@@ -52,11 +52,11 @@ public List<String> getCommand() {
     return command;
   }
 
-  public boolean isSwitchUser() {
-    return switchUser;
+  public boolean isRunAsTaskUser() {
+    return runAsTaskUser;
   }
 
-  public void setSwitchUser(boolean switchUser) {
-    this.switchUser = switchUser;
+  public void setRunAsTaskUser(boolean runAsTaskUser) {
+    this.runAsTaskUser = runAsTaskUser;
   }
 }
diff --git a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandRunner.java b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandRunner.java
index ec21ed989c..8984dfa966 100644
--- a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandRunner.java
+++ b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/shells/SingularityExecutorShellCommandRunner.java
@@ -22,7 +22,6 @@
 import com.hubspot.singularity.executor.config.SingularityExecutorConfiguration;
 import com.hubspot.singularity.executor.task.SingularityExecutorTask;
 import com.hubspot.singularity.executor.task.SingularityExecutorTaskProcessCallable;
-import com.spotify.docker.client.DockerClient;
 
 public class SingularityExecutorShellCommandRunner {
 
@@ -126,7 +125,7 @@ public boolean apply(SingularityExecutorShellCommandDescriptor input) {
 
     List<String> command = new ArrayList<>();
 
-    if (shellCommandDescriptor.isSwitchUser()) {
+    if (shellCommandDescriptor.isRunAsTaskUser()) {
       String switchUserCommand = String.format(executorConfiguration.getSwitchUserCommandFormat(), taskProcess.getTask().getExecutorData().getUser().or(executorConfiguration.getDefaultRunAsUser()));
       command.addAll(Arrays.asList(switchUserCommand.split("\\s+")));
     }