From 790d5661c52ac6540f24d763a56a8a712f5ee2d5 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Tue, 6 Nov 2018 11:30:45 -0800
Subject: [PATCH] escape username

---
 builder/vmware/common/step_export.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builder/vmware/common/step_export.go b/builder/vmware/common/step_export.go
index 173de488b..77f49acc0 100644
--- a/builder/vmware/common/step_export.go
+++ b/builder/vmware/common/step_export.go
@@ -28,6 +28,8 @@ type StepExport struct {
 
 func (s *StepExport) generateArgs(c *DriverConfig, displayName string, hidePassword bool) []string {
 	password := url.QueryEscape(c.RemotePassword)
+	username := url.QueryEscape(c.RemoteUser)
+
 	if hidePassword {
 		password = "****"
 	}
@@ -36,7 +38,7 @@ func (s *StepExport) generateArgs(c *DriverConfig, displayName string, hidePassw
 		"--skipManifestCheck",
 		"-tt=" + s.Format,
 
-		"vi://" + c.RemoteUser + ":" + password + "@" + c.RemoteHost + "/" + displayName,
+		"vi://" + username + ":" + password + "@" + c.RemoteHost + "/" + displayName,
 		s.OutputDir,
 	}
 	return append(s.OVFToolOptions, args...)