Fix working with orphaned devices

hashicorp · Mar 19, 2020 · 1647f77 · 1647f77
1 parent 443552c
commit 1647f77
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go b/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go
@@ -463,6 +463,7 @@ func DiskRefreshOperation(d *schema.ResourceData, c *govmomi.Client, l object.Vi
 				// Skip any of these keys as we won't be matching any of those anyway here
 				continue
 			}
+
 			if !diskUUIDMatch(device, m["uuid"].(string)) {
 				// Skip any device that doesn't match UUID
 				continue
@@ -472,6 +473,12 @@ func DiskRefreshOperation(d *schema.ResourceData, c *govmomi.Client, l object.Vi
 			if err := r.Read(l); err != nil {
 				return fmt.Errorf("%s: %s", r.Addr(), err)
 			}
+
+			if strings.HasPrefix(r.Get("label").(string), diskOrphanedPrefix) {
+				// Skip if it's previously discovered orphaned device
+				continue
+			}
+
 			// Done reading, push this onto our new set and remove the device from
 			// the list
 			newSet = append(newSet, r.Data())