vsphere-clone: rearrange build steps to ensure source VM exists before deleting target

Author: YuriyAM

builder/vsphere/clone/step_clone.go

@@ -135,19 +135,20 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist
 	d := state.Get("driver").(driver.Driver)
 	vmPath := path.Join(s.Location.Folder, s.Location.VMName)
 
-	err := d.PreCleanVM(ui, vmPath, s.Force, s.Location.Cluster, s.Location.Host, s.Location.ResourcePool)
+	ui.Say("Finding virtual machine to clone...")
+	template, err := d.FindVM(s.Config.Template)
 	if err != nil {
-		state.Put("error", err)
+		state.Put("error", fmt.Errorf("error finding virtual machine to clone: %s", err))
 		return multistep.ActionHalt
 	}
 
-	ui.Say("Cloning virtual machine...")
-	template, err := d.FindVM(s.Config.Template)
+	err = d.PreCleanVM(ui, vmPath, s.Force, s.Location.Cluster, s.Location.Host, s.Location.ResourcePool)
 	if err != nil {
-		state.Put("error", fmt.Errorf("error finding virtual machine to clone: %s", err))
+		state.Put("error", err)
 		return multistep.ActionHalt
 	}
 
+	ui.Say("Cloning virtual machine...")
 	var disks []driver.Disk
 	for _, disk := range s.Config.StorageConfig.Storage {
 		disks = append(disks, driver.Disk{

builder/vsphere/clone/step_clone_test.go

@@ -159,6 +159,11 @@ func TestStepCreateVM_Run(t *testing.T) {
 		t.Fatalf("unexpected action: expected '%#v', but returned '%#v'", multistep.ActionContinue, action)
 	}
 
+	// Find VM
+	if !driverMock.FindVMCalled {
+		t.Fatalf("unexpected result: expected '%s' to be called", "FindVM")
+	}
+
 	// Pre clean VM
 	if !driverMock.PreCleanVMCalled {
 		t.Fatalf("unexpected result: expected '%s' to be called", "PreCleanVM")
@@ -170,13 +175,10 @@ func TestStepCreateVM_Run(t *testing.T) {
 		t.Fatalf("unexpected result: expected '%s', but returned '%s'", vmPath, driverMock.PreCleanVMPath)
 	}
 
-	if !driverMock.FindVMCalled {
-		t.Fatalf("unexpected result: expected '%s' to be called", "FindVM")
-	}
+	// Clone VM
 	if !vmMock.CloneCalled {
 		t.Fatalf("unexpected result: expected '%s' to be called", "Clone")
 	}
-
 	if diff := cmp.Diff(vmMock.CloneConfig, driverCreateConfig(step.Config, step.Location)); diff != "" {
 		t.Fatalf("unexpected result: '%s'", diff)
 	}