From 8adbba6904d5ae0f05df2372536c5c8caa793479 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Tue, 27 Oct 2020 10:37:03 -0700
Subject: [PATCH] switch to guard clause format

---
 builder/vsphere/common/step_remote_upload.go | 37 +++++++++++---------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/builder/vsphere/common/step_remote_upload.go b/builder/vsphere/common/step_remote_upload.go
index 9df7668e3..413d0c051 100644
--- a/builder/vsphere/common/step_remote_upload.go
+++ b/builder/vsphere/common/step_remote_upload.go
@@ -89,24 +89,29 @@ func (s *StepRemoteUpload) Cleanup(state multistep.StateBag) {
 		return
 	}
 
+	if !s.UploadedCustomCD {
+		return
+	}
+
+	UploadedCDPath, ok := state.GetOk("cd_path")
+	if !ok {
+		return
+	}
+
 	ui := state.Get("ui").(packer.Ui)
 	d := state.Get("driver").(*driver.VCenterDriver)
+	ui.Say("Deleting cd_files image from remote datastore ...")
+
+	ds, err := d.FindDatastore(s.Datastore, s.Host)
+	if err != nil {
+		log.Printf("Error finding datastore to delete custom CD; please delete manually: %s", err)
+		return
+	}
+
+	err = ds.Delete(UploadedCDPath.(string))
+	if err != nil {
+		log.Printf("Error deleting custom CD from remote datastore; please delete manually: %s", err)
+		return
 
-	if s.UploadedCustomCD {
-		if UploadedCDPath, ok := state.GetOk("cd_path"); ok {
-			ui.Say("Deleting cd_files image from remote datastore ...")
-
-			ds, err := d.FindDatastore(s.Datastore, s.Host)
-			if err != nil {
-				log.Printf("Error finding datastore to delete custom CD; please delete manually: %s", err)
-				return
-			}
-
-			err = ds.Delete(UploadedCDPath.(string))
-			if err != nil {
-				log.Printf("Error deleting custom CD from remote datastore; please delete manually: %s", err)
-				return
-			}
-		}
 	}
 }