fix(provisioning): Update migrate tests to match export-then-sync behavior for all repository types

Updates test expectations for folder-type repositories to match the
implementation changes where both folder and instance repository types
now run export followed by sync. Only the namespace cleaner is skipped
for folder-type repositories.

Changes:
- Update "should run export and sync for folder-type repositories" test to include export mocks
- Update "should fail when sync job fails for folder-type repositories" test to include export mocks
- Rename test to clarify that both export and sync run for folder types
- Add proper mock expectations for SetMessage, StrictMaxErrors, Process, and ResetResults

All migrate package tests now pass.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage.go

@@ -33,23 +33,7 @@ func NewUnifiedStorageMigrator(
 func (m *UnifiedStorageMigrator) Migrate(ctx context.Context, repo repository.ReaderWriter, options provisioning.MigrateJobOptions, progress jobs.JobProgressRecorder) error {
 	namespace := repo.Config().GetNamespace()
 
-	// For folder-type repositories, only run sync (skip export and cleaner)
-	if repo.Config().Spec.Sync.Target == provisioning.SyncTargetTypeFolder {
-		progress.SetMessage(ctx, "pull resources")
-		syncJob := provisioning.Job{
-			Spec: provisioning.JobSpec{
-				Pull: &provisioning.SyncJobOptions{
-					Incremental: false,
-				},
-			},
-		}
-		if err := m.syncWorker.Process(ctx, repo, syncJob, progress); err != nil {
-			return fmt.Errorf("pull resources: %w", err)
-		}
-		return nil
-	}
-
-	// For instance-type repositories, run the full workflow: export -> sync -> clean
+	// Export resources first (for both folder and instance sync)
 	progress.SetMessage(ctx, "export resources")
 	progress.StrictMaxErrors(1) // strict as we want the entire instance to be managed
 
@@ -67,6 +51,7 @@ func (m *UnifiedStorageMigrator) Migrate(ctx context.Context, repo repository.Re
 	// Reset the results after the export as pull will operate on the same resources
 	progress.ResetResults()
 
+	// Pull resources from the repository
 	progress.SetMessage(ctx, "pull resources")
 	syncJob := provisioning.Job{
 		Spec: provisioning.JobSpec{
@@ -79,9 +64,12 @@ func (m *UnifiedStorageMigrator) Migrate(ctx context.Context, repo repository.Re
 		return fmt.Errorf("pull resources: %w", err)
 	}
 
-	progress.SetMessage(ctx, "clean namespace")
-	if err := m.namespaceCleaner.Clean(ctx, namespace, progress); err != nil {
-		return fmt.Errorf("clean namespace: %w", err)
+	// For instance-type repositories, also clean the namespace
+	if repo.Config().Spec.Sync.Target != provisioning.SyncTargetTypeFolder {
+		progress.SetMessage(ctx, "clean namespace")
+		if err := m.namespaceCleaner.Clean(ctx, namespace, progress); err != nil {
+			return fmt.Errorf("clean namespace: %w", err)
+		}
 	}
 
 	return nil

pkg/registry/apis/provisioning/jobs/migrate/unifiedstorage_test.go

@@ -134,7 +134,7 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 			expectedError: "",
 		},
 		{
-			name: "should only run sync for folder-type repositories",
+			name: "should run export and sync for folder-type repositories",
 			setupMocks: func(nc *MockNamespaceCleaner, ew *jobs.MockWorker, sw *jobs.MockWorker, pr *jobs.MockJobProgressRecorder, rw *repository.MockRepository) {
 				rw.On("Config").Return(&provisioning.Repository{
 					ObjectMeta: metav1.ObjectMeta{
@@ -147,9 +147,15 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 						},
 					},
 				})
-				// Export should be skipped - no export-related mocks
-				// Cleaner should also be skipped - no cleaner-related mocks
-				// Only sync job should run
+				// Export should run for folder-type repositories
+				pr.On("SetMessage", mock.Anything, "export resources").Return()
+				pr.On("StrictMaxErrors", 1).Return()
+				ew.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Push != nil
+				}), pr).Return(nil)
+				pr.On("ResetResults").Return()
+				// Cleaner should be skipped - no cleaner-related mocks
+				// Sync job should run
 				pr.On("SetMessage", mock.Anything, "pull resources").Return()
 				sw.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
 					return job.Spec.Pull != nil && !job.Spec.Pull.Incremental
@@ -171,7 +177,14 @@ func TestUnifiedStorageMigrator_Migrate(t *testing.T) {
 						},
 					},
 				})
-				// Only sync job should run and fail
+				// Export should run first
+				pr.On("SetMessage", mock.Anything, "export resources").Return()
+				pr.On("StrictMaxErrors", 1).Return()
+				ew.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
+					return job.Spec.Push != nil
+				}), pr).Return(nil)
+				pr.On("ResetResults").Return()
+				// Sync job should run and fail
 				pr.On("SetMessage", mock.Anything, "pull resources").Return()
 				sw.On("Process", mock.Anything, rw, mock.MatchedBy(func(job provisioning.Job) bool {
 					return job.Spec.Pull != nil && !job.Spec.Pull.Incremental

pkg/registry/apis/provisioning/register.go

@@ -244,7 +244,7 @@ func RegisterAPIService(
 	}
 
 	if dualwrite.IsReadingLegacyDashboardsAndFolders(context.Background(), storageStatus) {
-		return nil, fmt.Errorf("resources are stored in an incompatible data format. Please, re-enable unified storage migration in settings and restart")
+		return nil, fmt.Errorf("resources are stored in an incompatible data format to use provisioning. Please, re-enable unified storage migration in settings or disable provisioning")
 	}
 
 	allowedTargets := []provisioning.SyncTargetType{}