From e7e6a80587a33a2f22aab219c1656b2214dfc15e Mon Sep 17 00:00:00 2001
From: Alexander Laamanen <al@iki.fi>
Date: Thu, 23 Feb 2017 22:29:53 +0200
Subject: [PATCH] No need to make upload public.

---
 builder/vmware/common/driver_esx5.go        | 6 +++---
 builder/vmware/common/remote_driver.go      | 2 +-
 builder/vmware/common/remote_driver_mock.go | 2 +-
 builder/vmware/common/step_upload_vmx.go    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go
index c841e6639..d17f9404a 100644
--- a/builder/vmware/common/driver_esx5.go
+++ b/builder/vmware/common/driver_esx5.go
@@ -148,7 +148,7 @@ func (d *ESX5Driver) Stop(vmxPathLocal string) error {
 
 func (d *ESX5Driver) Register(vmxPathLocal string) error {
 	vmxPath := filepath.ToSlash(filepath.Join(d.outputDir, filepath.Base(vmxPathLocal)))
-	if err := d.Upload(vmxPath, vmxPathLocal); err != nil {
+	if err := d.upload(vmxPath, vmxPathLocal); err != nil {
 		return err
 	}
 	r, err := d.run(nil, "vim-cmd", "solo/registervm", strconv.Quote(vmxPath))
@@ -191,7 +191,7 @@ func (d *ESX5Driver) UploadISO(localPath string, checksum string, checksumType s
 		return finalPath, nil
 	}
 
-	if err := d.Upload(finalPath, localPath); err != nil {
+	if err := d.upload(finalPath, localPath); err != nil {
 		return "", err
 	}
 
@@ -637,7 +637,7 @@ func (d *ESX5Driver) mkdir(path string) error {
 	return d.sh("mkdir", "-p", strconv.Quote(path))
 }
 
-func (d *ESX5Driver) Upload(dst, src string) error {
+func (d *ESX5Driver) upload(dst, src string) error {
 	f, err := os.Open(src)
 	if err != nil {
 		return err
diff --git a/builder/vmware/common/remote_driver.go b/builder/vmware/common/remote_driver.go
index bc2454297..c0c6ffb60 100644
--- a/builder/vmware/common/remote_driver.go
+++ b/builder/vmware/common/remote_driver.go
@@ -24,7 +24,7 @@ type RemoteDriver interface {
 	IsDestroyed() (bool, error)
 
 	// Uploads a local file to remote side.
-	Upload(dst, src string) error
+	upload(dst, src string) error
 
 	// Download a remote file to a local file.
 	Download(src, dst string) error
diff --git a/builder/vmware/common/remote_driver_mock.go b/builder/vmware/common/remote_driver_mock.go
index 10338c86c..773c7103e 100644
--- a/builder/vmware/common/remote_driver_mock.go
+++ b/builder/vmware/common/remote_driver_mock.go
@@ -57,7 +57,7 @@ func (d *RemoteDriverMock) IsDestroyed() (bool, error) {
 	return d.IsDestroyedResult, d.IsDestroyedErr
 }
 
-func (d *RemoteDriverMock) Upload(dst, src string) error {
+func (d *RemoteDriverMock) upload(dst, src string) error {
 	return d.UploadErr
 }
 
diff --git a/builder/vmware/common/step_upload_vmx.go b/builder/vmware/common/step_upload_vmx.go
index 646225a7c..cdf64b56a 100644
--- a/builder/vmware/common/step_upload_vmx.go
+++ b/builder/vmware/common/step_upload_vmx.go
@@ -34,7 +34,7 @@ func (c *StepUploadVMX) Run(_ context.Context, state multistep.StateBag) multist
 		if ok {
 			remoteVmxPath := filepath.ToSlash(filepath.Join(fmt.Sprintf("%s", remoteDriver), filepath.Base(vmxPath)))
 			log.Printf("Uploading VMX file from %s to %s", vmxPath, remoteVmxPath)
-			if err := remoteDriver.Upload(remoteVmxPath, vmxPath); err != nil {
+			if err := remoteDriver.upload(remoteVmxPath, vmxPath); err != nil {
 				state.Put("error", fmt.Errorf("Error writing VMX: %s", err))
 				return multistep.ActionHalt
 			}