Don't delete legacy files after migration. (#281)

Author: cmrigney

pkg/migrate/migrate.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path/filepath"
 	"strings"
 
 	legacycatalog "github.com/docker/mcp-gateway/pkg/catalog"
@@ -74,12 +73,6 @@ func MigrateConfig(ctx context.Context, docker docker.Client, dao db.DAO) {
 
 	// Migration considered successful by this point
 	status = MigrationStatusSuccess
-
-	err = backupLegacyFiles()
-	if err != nil {
-		logs = append(logs, fmt.Sprintf("failed to backup legacy files: %s", err.Error()))
-		return
-	}
 }
 
 func createDefaultProfile(ctx context.Context, dao db.DAO, registry *config.Registry, cfg map[string]map[string]any, tools *config.ToolsConfig, oldCatalog *legacycatalog.Catalog) ([]string, error) {
@@ -187,66 +180,3 @@ func readLegacyDefaults(ctx context.Context, docker docker.Client) (*config.Regi
 
 	return &registry, cfg, &tools, &mcpCatalog, nil
 }
-
-func backupLegacyFiles() error {
-	// Create backup directory
-	backupDir, err := config.FilePath(".backup")
-	if err != nil {
-		return fmt.Errorf("failed to get backup directory path: %w", err)
-	}
-
-	err = os.MkdirAll(backupDir, 0o755)
-	if err != nil {
-		return fmt.Errorf("failed to create backup directory: %w", err)
-	}
-
-	// Get paths to legacy files
-	registryPath, err := config.FilePath("registry.yaml")
-	if err != nil {
-		return fmt.Errorf("failed to get registry path: %w", err)
-	}
-	configPath, err := config.FilePath("config.yaml")
-	if err != nil {
-		return fmt.Errorf("failed to get config path: %w", err)
-	}
-	toolsPath, err := config.FilePath("tools.yaml")
-	if err != nil {
-		return fmt.Errorf("failed to get tools path: %w", err)
-	}
-
-	catalogIndexPath, err := config.FilePath("catalog.json")
-	if err != nil {
-		return fmt.Errorf("failed to get catalog index path: %w", err)
-	}
-
-	catalogsDir, err := config.FilePath("catalogs")
-	if err != nil {
-		return fmt.Errorf("failed to get old catalog path: %w", err)
-	}
-
-	oldCatalogPath := filepath.Join(catalogsDir, legacycatalog.DockerCatalogFilename)
-
-	// Move files to backup directory
-	_ = moveFile(registryPath, filepath.Join(backupDir, "registry.yaml"))
-	_ = moveFile(configPath, filepath.Join(backupDir, "config.yaml"))
-	_ = moveFile(toolsPath, filepath.Join(backupDir, "tools.yaml"))
-	_ = moveFile(catalogIndexPath, filepath.Join(backupDir, "catalog.json"))
-	_ = moveFile(oldCatalogPath, filepath.Join(backupDir, legacycatalog.DockerCatalogFilename))
-
-	// We use os.Remove to remove the directory, so it's only removed if empty
-	// We don't want to remove any custom catalog yamls the user may have added
-	_ = os.Remove(catalogsDir)
-
-	return nil
-}
-
-// moveFile moves a file from src to dst. If src doesn't exist, it's a no-op.
-func moveFile(src, dst string) error {
-	// Check if source file exists
-	if _, err := os.Stat(src); os.IsNotExist(err) {
-		return nil // File doesn't exist, nothing to move
-	}
-
-	// Move the file
-	return os.Rename(src, dst)
-}

pkg/migrate/migrate_test.go

@@ -122,9 +122,6 @@ func TestMigrateConfig_SuccessWithServers(t *testing.T) {
 	// Verify secrets
 	assert.Len(t, workingSets[0].Secrets, 1)
 	assert.Equal(t, "docker-desktop-store", workingSets[0].Secrets["default"].Provider)
-
-	// Verify legacy files were backed up
-	assertLegacyFilesBackedUp(t, mcpDir)
 }
 
 func TestMigrateConfig_SuccessWithSingleServer(t *testing.T) {
@@ -184,9 +181,6 @@ func TestMigrateConfig_SkipsWithNoServers(t *testing.T) {
 	workingSets, err := dao.ListWorkingSets(ctx)
 	require.NoError(t, err)
 	assert.Empty(t, workingSets)
-
-	// Verify legacy files were still backed up
-	assertLegacyFilesBackedUp(t, mcpDir)
 }
 
 func TestMigrateConfig_FailureReadingLegacyFiles(t *testing.T) {
@@ -485,18 +479,6 @@ func TestMigrateConfig_LegacyFilesBackedUpOnSuccess(t *testing.T) {
 	status, err := dao.GetMigrationStatus(ctx)
 	require.NoError(t, err)
 	assert.Equal(t, MigrationStatusSuccess, status.Status)
-
-	// Verify all legacy files were backed up
-	assertLegacyFilesBackedUp(t, mcpDir)
-
-	// Verify catalog.json was also backed up
-	backupCatalogIndexPath := filepath.Join(mcpDir, ".backup", "catalog.json")
-	_, err = os.Stat(backupCatalogIndexPath)
-	assert.False(t, os.IsNotExist(err), "catalog.json should be backed up")
-
-	// Verify original catalog.json no longer exists
-	_, err = os.Stat(catalogIndexPath)
-	assert.True(t, os.IsNotExist(err), "original catalog.json should be removed")
 }
 
 // Helper functions
@@ -546,50 +528,6 @@ func writeCatalogFile(t *testing.T, mcpDir string, serverNames []string) {
 	require.NoError(t, err)
 }
 
-func assertLegacyFilesBackedUp(t *testing.T, mcpDir string) {
-	t.Helper()
-
-	backupDir := filepath.Join(mcpDir, ".backup")
-
-	// Verify backup directory exists
-	_, err := os.Stat(backupDir)
-	assert.False(t, os.IsNotExist(err), "backup directory should exist")
-
-	// Verify original files no longer exist in original location
-	registryPath := filepath.Join(mcpDir, "registry.yaml")
-	_, err = os.Stat(registryPath)
-	assert.True(t, os.IsNotExist(err), "original registry.yaml should be removed")
-
-	configPath := filepath.Join(mcpDir, "config.yaml")
-	_, err = os.Stat(configPath)
-	assert.True(t, os.IsNotExist(err), "original config.yaml should be removed")
-
-	toolsPath := filepath.Join(mcpDir, "tools.yaml")
-	_, err = os.Stat(toolsPath)
-	assert.True(t, os.IsNotExist(err), "original tools.yaml should be removed")
-
-	catalogPath := filepath.Join(mcpDir, "catalogs", legacycatalog.DockerCatalogFilename)
-	_, err = os.Stat(catalogPath)
-	assert.True(t, os.IsNotExist(err), "original catalog file should be removed")
-
-	// Verify files exist in backup directory
-	backupRegistryPath := filepath.Join(backupDir, "registry.yaml")
-	_, err = os.Stat(backupRegistryPath)
-	assert.False(t, os.IsNotExist(err), "registry.yaml should be backed up")
-
-	backupConfigPath := filepath.Join(backupDir, "config.yaml")
-	_, err = os.Stat(backupConfigPath)
-	assert.False(t, os.IsNotExist(err), "config.yaml should be backed up")
-
-	backupToolsPath := filepath.Join(backupDir, "tools.yaml")
-	_, err = os.Stat(backupToolsPath)
-	assert.False(t, os.IsNotExist(err), "tools.yaml should be backed up")
-
-	backupCatalogPath := filepath.Join(backupDir, legacycatalog.DockerCatalogFilename)
-	_, err = os.Stat(backupCatalogPath)
-	assert.False(t, os.IsNotExist(err), "catalog file should be backed up")
-}
-
 // mockDockerClient is a simple mock implementation of docker.Client for testing
 type mockDockerClient struct {
 	inspectVolumeFunc func(ctx context.Context, name string) (volume.Volume, error)