fix(frontend): preserve rebased resize preflight validation

Keep the rebased control plane resize branch on the validated inventory-preflight path and update the rebased tests to assert the normalized inventory errors without leaving a standalone follow-up fix commit.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: tuxerrante

pkg/frontend/admin_openshiftcluster_resize_controlplane_recovery_test.go

@@ -558,6 +558,8 @@ func TestRollbackAllFailsFastWhenEtcdUnhealthyBetweenNodes(t *testing.T) {
 }
 
 func TestAdminReplyPreservesWrappedCloudError(t *testing.T) {
+	t.Parallel()
+
 	recorder := httptest.NewRecorder()
 	_, log := testlog.New()
 

pkg/frontend/admin_openshiftcluster_vmresize_pre_validation.go

@@ -182,6 +182,11 @@ func (f *frontend) preResizeControlPlaneVMsValidation(
 		return nil, preResizeControlPlaneValidationError(details)
 	}
 
+	collect(validateResizeControlPlaneInventory(ctx, log, k, a, doc.OpenShiftCluster.Properties.ClusterProfile.ResourceGroupID))
+	if len(details) > 0 {
+		return nil, preResizeControlPlaneValidationError(details)
+	}
+
 	return json.Marshal("All pre-flight checks passed")
 }
 
@@ -218,6 +223,7 @@ func validateResizeControlPlaneInventory(
 
 	return nil
 }
+
 // defaultValidateResizeQuota creates an FP-authorized compute usage client and
 // delegates to checkResizeComputeQuota. Injected via f.validateResizeQuota so
 // tests can swap it with quotaCheckDisabled.

pkg/frontend/admin_openshiftcluster_vmresize_pre_validation_test.go

@@ -331,7 +331,7 @@ func TestValidateResizeControlPlaneInventory(t *testing.T) {
 
 		err := validateResizeControlPlaneInventory(ctx, log, k, a, "/subscriptions/000/resourceGroups/test-cluster")
 		assertErrorContainsAll(t, err,
-			"Control plane machine inventory is inconsistent",
+			"control plane machine inventory is inconsistent",
 			"All machines should have the same size",
 		)
 	})
@@ -357,10 +357,16 @@ func TestValidateResizeControlPlaneInventory(t *testing.T) {
 				controlPlaneNode("master-1", "Standard_D16s_v5", "Standard_D16s_v5", true, false),
 				controlPlaneNode("master-2", "Standard_D8s_v3", "Standard_D8s_v3", true, false),
 			), nil)
+		a.EXPECT().GetVirtualMachine(gomock.Any(), "test-cluster", "master-0", mgmtcompute.InstanceView).
+			Return(inventoryValidationVM("Standard_D8s_v3", "1"), nil)
+		a.EXPECT().GetVirtualMachine(gomock.Any(), "test-cluster", "master-1", mgmtcompute.InstanceView).
+			Return(inventoryValidationVM("Standard_D8s_v3", "2"), nil)
+		a.EXPECT().GetVirtualMachine(gomock.Any(), "test-cluster", "master-2", mgmtcompute.InstanceView).
+			Return(inventoryValidationVM("Standard_D8s_v3", "3"), nil)
 
 		err := validateResizeControlPlaneInventory(ctx, log, k, a, "/subscriptions/000/resourceGroups/test-cluster")
 		assertErrorContainsAll(t, err,
-			"Control plane machine and node inventory is inconsistent",
+			"control plane machine and node inventory is inconsistent",
 			"machine master-1 has size Standard_D8s_v3 in its spec, however node has instance-type Standard_D16s_v5",
 		)
 	})
@@ -426,6 +432,7 @@ func TestPreResizeControlPlaneVMsValidationRejectsHeterogeneousInventory(t *test
 		"All machines should have the same size",
 	)
 }
+
 func TestPreResizeControlPlaneVMsValidation(t *testing.T) {
 	t.Parallel()
 
@@ -1094,6 +1101,8 @@ func TestPreResizeControlPlaneVMsValidation(t *testing.T) {
 }
 
 func TestValidateResizeControlPlaneInventoryNormalizesJoinedErrorLineEndings(t *testing.T) {
+	t.Parallel()
+
 	ctx := context.Background()
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()