fix(disk): restore updating boot disk.

Signed-off-by: Marco Attia <[email protected]>

Author: Vaneixus

proxmoxtf/resource/vm/disk/disk.go

@@ -582,8 +582,9 @@ func Update(
 	planDisks vms.CustomStorageDevices,
 	currentDisks vms.CustomStorageDevices,
 	updateBody *vms.UpdateRequestBody,
-) (bool, error) {
+) (bool, bool, error) {
 	rebootRequired := false
+	shutdownBeforeUpdate := false
 
 	if d.HasChange(MkDisk) {
 		for iface, disk := range planDisks {
@@ -595,7 +596,7 @@ func Update(
 					// only disks with defined file ID are custom image disks that need to be created via import.
 					err := createCustomDisk(ctx, client, nodeName, vmID, iface, *disk)
 					if err != nil {
-						return false, fmt.Errorf("creating custom disk: %w", err)
+						return false, false, fmt.Errorf("creating custom disk: %w", err)
 					}
 				} else {
 					// otherwise this is a blank disk that can be added directly via update API
@@ -611,7 +612,7 @@ func Update(
 				tmp = currentDisks[iface]
 			default:
 				// something went wrong
-				return false, fmt.Errorf("missing device %s", iface)
+				return false, false, fmt.Errorf("missing device %s", iface)
 			}
 
 			if tmp == nil || disk == nil {
@@ -623,8 +624,13 @@ func Update(
 				tmp.AIO = disk.AIO
 			}
 
-			// Never send ImportFrom for existing disks - it triggers re-import which fails for boot disks
-			// ImportFrom is only for initial disk creation, not updates
+			if disk.ImportFrom != nil && *disk.ImportFrom != "" {
+				rebootRequired = true
+				shutdownBeforeUpdate = true
+				tmp.DatastoreID = disk.DatastoreID
+				tmp.ImportFrom = disk.ImportFrom
+				tmp.Size = disk.Size
+			}
 
 			tmp.Backup = disk.Backup
 			tmp.BurstableReadSpeedMbps = disk.BurstableReadSpeedMbps
@@ -646,5 +652,5 @@ func Update(
 		}
 	}
 
-	return rebootRequired, nil
+	return shutdownBeforeUpdate, rebootRequired, nil
 }

proxmoxtf/resource/vm/disk/disk_test.go

@@ -337,7 +337,7 @@ func TestDiskUpdateSkipsUnchangedDisks(t *testing.T) {
 	require.NoError(t, err)
 
 	// Call the Update function
-	_, err = Update(ctx, client, nodeName, vmID, resourceData, planDisks, currentDisks, updateBody)
+	_, _, err = Update(ctx, client, nodeName, vmID, resourceData, planDisks, currentDisks, updateBody)
 	require.NoError(t, err)
 
 	// Check that only the changed disk (scsi1) is in the update body

proxmoxtf/resource/vm/vm.go

@@ -5426,7 +5426,7 @@ func vmUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.D
 		return diag.FromErr(err)
 	}
 
-	rr, err := disk.Update(ctx, client, nodeName, vmID, d, planDisks, allDiskInfo, updateBody)
+	stoppedBeforeUpdate, rr, err := disk.Update(ctx, client, nodeName, vmID, d, planDisks, allDiskInfo, updateBody)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -5461,7 +5461,6 @@ func vmUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.D
 	}
 
 	// Prepare the new cloud-init configuration.
-	stoppedBeforeUpdate := false
 	cloudInitRebuildRequired := false
 
 	if d.HasChange(mkInitialization) {
@@ -5750,16 +5749,11 @@ func vmUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.D
 	// Update the configuration now that everything has been prepared.
 	updateBody.Delete = del
 
-	e = vmAPI.UpdateVM(ctx, updateBody)
-	if e != nil {
-		return diag.FromErr(e)
-	}
-
 	// Determine if the state of the virtual machine state needs to be changed.
 	//nolint: nestif
 	if (d.HasChange(mkStarted) || stoppedBeforeUpdate) && !bool(template) {
 		started := d.Get(mkStarted).(bool)
-		if started {
+		if started && !stoppedBeforeUpdate {
 			if diags := vmStart(ctx, vmAPI, d); diags != nil {
 				return diags
 			}
@@ -5772,6 +5766,11 @@ func vmUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.D
 		}
 	}
 
+	e = vmAPI.UpdateVM(ctx, updateBody)
+	if e != nil {
+		return diag.FromErr(e)
+	}
+
 	if cloudInitRebuildRequired {
 		if er := vmAPI.RebuildCloudInitDisk(ctx); er != nil {
 			return diag.FromErr(err)