From aeadd039b77c6a175982884839327ff3d6818273 Mon Sep 17 00:00:00 2001
From: DanHam <DanHam@users.noreply.github.com>
Date: Thu, 10 May 2018 13:33:56 +0100
Subject: [PATCH] Fix #6240 by way of an update to github.com/masterzen/winrm
 (& winrm/soap)

$ govendor fetch -v github.com/masterzen/winrm
$ govendor fetch -v github.com/masterzen/winrm/soap

* In #6240 users reported problems that could be traced to the use of
  RunWithString in communicator/winrm/communicator.go.
* https://github.com/masterzen/winrm/pull/78 apparently fixed a
  race condition in RunWithString that only materialises with Go <= 1.10;
  This is possibly why we are only seeing this with recent releases.
  Additionally, the intermittent nature of the errors and error messages
  seen are indicative of this type of problem... so here's hoping this
  fixes things...
---
 vendor/github.com/masterzen/winrm/client.go | 33 +++++++++++++++++----
 vendor/vendor.json                          | 10 +++----
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/vendor/github.com/masterzen/winrm/client.go b/vendor/github.com/masterzen/winrm/client.go
index 732dd61cb..c19515194 100644
--- a/vendor/github.com/masterzen/winrm/client.go
+++ b/vendor/github.com/masterzen/winrm/client.go
@@ -152,10 +152,20 @@ func (c *Client) RunWithString(command string, stdin string) (string, string, in
 	}
 
 	var outWriter, errWriter bytes.Buffer
-	go io.Copy(&outWriter, cmd.Stdout)
-	go io.Copy(&errWriter, cmd.Stderr)
+	var wg sync.WaitGroup
+	wg.Add(2)
+	go func() {
+		defer wg.Done()
+		io.Copy(&outWriter, cmd.Stdout)
+	}()
+
+	go func() {
+		defer wg.Done()
+		io.Copy(&errWriter, cmd.Stderr)
+	}()
 
 	cmd.Wait()
+	wg.Wait()
 
 	return outWriter.String(), errWriter.String(), cmd.ExitCode(), cmd.err
 }
@@ -176,11 +186,24 @@ func (c Client) RunWithInput(command string, stdout, stderr io.Writer, stdin io.
 		return 1, err
 	}
 
-	go io.Copy(cmd.Stdin, stdin)
-	go io.Copy(stdout, cmd.Stdout)
-	go io.Copy(stderr, cmd.Stderr)
+	var wg sync.WaitGroup
+	wg.Add(3)
+
+	go func() {
+		defer wg.Done()
+		io.Copy(cmd.Stdin, stdin)
+	}()
+	go func() {
+		defer wg.Done()
+		io.Copy(stdout, cmd.Stdout)
+	}()
+	go func() {
+		defer wg.Done()
+		io.Copy(stderr, cmd.Stderr)
+	}()
 
 	cmd.Wait()
+	wg.Wait()
 
 	return cmd.ExitCode(), cmd.err
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 1f08d096b..f3e751ef9 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -988,16 +988,16 @@
 			"revision": "95ba30457eb1121fa27753627c774c7cd4e90083"
 		},
 		{
-			"checksumSHA1": "8z5kCCFRsBkhXic9jxxeIV3bBn8=",
+			"checksumSHA1": "dVQEUn5TxdIAXczK7rh6qUrq44Q=",
 			"path": "github.com/masterzen/winrm",
-			"revision": "a2df6b1315e6fd5885eb15c67ed259e85854125f",
-			"revisionTime": "2017-08-14T13:39:27Z"
+			"revision": "7e40f93ae939004a1ef3bd5ff5c88c756ee762bb",
+			"revisionTime": "2018-02-24T16:03:50Z"
 		},
 		{
 			"checksumSHA1": "XFSXma+KmkhkIPsh4dTd/eyja5s=",
 			"path": "github.com/masterzen/winrm/soap",
-			"revision": "a2df6b1315e6fd5885eb15c67ed259e85854125f",
-			"revisionTime": "2017-08-14T13:39:27Z"
+			"revision": "7e40f93ae939004a1ef3bd5ff5c88c756ee762bb",
+			"revisionTime": "2018-02-24T16:03:50Z"
 		},
 		{
 			"checksumSHA1": "NkbetqlpWBi3gP08JDneC+axTKw=",