From 7ab909a3c0624ea6e949f60e19f2373250b920df Mon Sep 17 00:00:00 2001
From: Jonathan Senkerik <josenk@jintegrate.co>
Date: Sun, 16 Feb 2020 14:07:36 -0500
Subject: [PATCH] v1.6.3, mask user/pass in logs, enableUUID

---
 README.md               | 7 ++++---
 esxi/guest-create.go    | 5 ++++-
 esxi/guest_functions.go | 5 +++++
 version                 | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0f6536d..351f041 100644
--- a/README.md
+++ b/README.md
@@ -163,9 +163,9 @@ Configuration reference
 
 
 * resource "esxi_virtual_disk"
-  * virtual_disk_disk_store - Required - esxi Disk Store where guest vm will be created.
-  * virtual_disk_dir - Required - Disk dir.
-  * virtual_disk_name - Optional - Virtual Disk Name. A random virtual disk name will be generated if nil.
+  * virtual_disk_disk_store - Required - esxi Disk Store where virtual disk will be created.
+  * virtual_disk_dir - Required - A subdirectory to contain the virtual disk. (Can be the same as guest_name)
+  * virtual_disk_name - Optional - Virtual Disk Name.  (ext must be .vmdk)
   * virtual_disk_size - Optional - Virtual Disk size in GB. Default 1GB.
   * virtual_disk_type - Optional - Virtual Disk type.  (thin, zeroedthick or eagerzeroedthick) Default 'thin'.
 
@@ -235,6 +235,7 @@ Known issues with vmware_esxi
 
 Version History
 ---------------
+* 1.6.3 Mask username/password in debug logs.  Set default, disk.EnableUUID = true.
 * 1.6.2 Fix Defaults for guest_startup_timeout and guest_shutdown_timeout.  Fix IP address detection type2 to always run regardless of guest_startup_timeout value.
 * 1.6.1 Fix some minor refresh bugs, allow http(s) ovf sources.
 * 1.6.0 Add support for ovf_properties for OVF/OVA sources.
diff --git a/esxi/guest-create.go b/esxi/guest-create.go
index 4150f9f..d7d7f24 100644
--- a/esxi/guest-create.go
+++ b/esxi/guest-create.go
@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"os"
 	"os/exec"
+	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
@@ -122,6 +123,7 @@ func guestCREATE(c *Config, guest_name string, disk_store string,
 				fmt.Sprintf("scsi0.present = \\\"TRUE\\\"\n") +
 				fmt.Sprintf("scsi0.sharedBus = \\\"none\\\"\n") +
 				fmt.Sprintf("scsi0.virtualDev = \\\"lsilogic\\\"\n") +
+				fmt.Sprintf("disk.EnableUUID = \\\"TRUE\\\"\n") +
 				fmt.Sprintf("pciBridge0.present = \\\"TRUE\\\"\n") +
 				fmt.Sprintf("pciBridge4.present = \\\"TRUE\\\"\n") +
 				fmt.Sprintf("pciBridge4.virtualDev = \\\"pcieRootPort\\\"\n") +
@@ -283,7 +285,8 @@ func guestCREATE(c *Config, guest_name string, disk_store string,
 		//  Execute ovftool script (or batch) here.
 		cmd := exec.Command(osShellCmd, osShellCmdOpt, ovf_cmd)
 
-		log.Printf("[guestCREATE] ovf_cmd: %s\n", ovf_cmd)
+		re := regexp.MustCompile(`vi://.*?@`)
+		log.Printf("[guestCREATE] ovf_cmd: %s\n", re.ReplaceAllString(ovf_cmd, "vi://XXXX:YYYY@"))
 
 		cmd.Stdout = &out
 		err = cmd.Run()
diff --git a/esxi/guest_functions.go b/esxi/guest_functions.go
index be239e4..9983b08 100644
--- a/esxi/guest_functions.go
+++ b/esxi/guest_functions.go
@@ -322,6 +322,11 @@ func updateVmx_contents(c *Config, vmid string, iscreate bool, memsize int, numv
 		}
 	}
 
+	//  Add disk UUID
+	if !strings.Contains(vmx_contents, "disk.EnableUUID") {
+		vmx_contents = vmx_contents + "\ndisk.EnableUUID = \"TRUE\""
+	}
+
 	//
 	//  Write vmx file to esxi host
 	//
diff --git a/version b/version
index d4f6e2c..78d19a2 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v1.6.2
+v1.6.3