Updated whoAmI to properly get user on Windows

rbutcher · jetersen · commit 5c43bbe5f552 · 2019-08-23T12:39:26.000+02:00
diff --git a/src/main/java/org/jenkinsci/plugins/docker/workflow/client/WindowsDockerClient.java b/src/main/java/org/jenkinsci/plugins/docker/workflow/client/WindowsDockerClient.java
@@ -103,6 +103,14 @@ public Optional<String> getContainerIdIfContainerized() throws IOException, Inte
         return Optional.of(getLongIdResult.getOut());
     }
 
+    @Override
+    public String whoAmI() throws IOException, InterruptedException {
+        try (ByteArrayOutputStream userId = new ByteArrayOutputStream()) {
+            launcher.launch().cmds("whoami").quiet(true).stdout(userId).start().joinWithTimeout(CLIENT_TIMEOUT, TimeUnit.SECONDS, launcher.getListener());
+            return userId.toString();
+        }
+    }
+
     private LaunchResult launch(EnvVars env, boolean quiet, FilePath workDir, String... args) throws IOException, InterruptedException {
         return launch(env, quiet, workDir, new ArgumentListBuilder(args));
     }

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,14 @@ public Optional<String> getContainerIdIfContainerized() throws IOException, Inte`
`103`	`103`	`return Optional.of(getLongIdResult.getOut());`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ @Override`
	`107`	`+ public String whoAmI() throws IOException, InterruptedException {`
	`108`	`+ try (ByteArrayOutputStream userId = new ByteArrayOutputStream()) {`
	`109`	`+ launcher.launch().cmds("whoami").quiet(true).stdout(userId).start().joinWithTimeout(CLIENT_TIMEOUT, TimeUnit.SECONDS, launcher.getListener());`
	`110`	`+ return userId.toString();`
	`111`	`+ }`
	`112`	`+ }`
	`113`	`+`
`106`	`114`	`private LaunchResult launch(EnvVars env, boolean quiet, FilePath workDir, String... args) throws IOException, InterruptedException {`
`107`	`115`	`return launch(env, quiet, workDir, new ArgumentListBuilder(args));`
`108`	`116`	`}`