@payfit/iac 1.0.0-ephemeral-migration-scripts.7 → 1.0.0-ephemeral-migration-scripts.8

package/dist/executors/stack-migration/lib/migration-tool.js

@@ -1,7 +1,4 @@
 "use strict";
-/**
- * Main migration tool orchestrating all migration steps
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationTool = void 0;
 const tslib_1 = require("tslib");
@@ -11,46 +8,29 @@ const migration_helper_1 = require("./migration-helper");
 const spacelift_client_1 = require("./spacelift-client");
 const templates_1 = require("./templates");
 class MigrationTool extends migration_helper_1.MigrationHelper {
-    /**
-     * Step 1: Setup Repositories
-     * Clones required repos, validates spacectl auth
-     */
     async setupRepositories(options) {
         this.logger.step(1, 9, 'Repository Setup and Validation');
-        // Get service repository info (from options or prompts)
-        if (options?.name) {
-            this.config.serviceRepository.name = options.name;
+        if (this.config.resuming &&
+            this.config.serviceRepository.name &&
+            this.config.serviceRepository.domain &&
+            this.config.serviceRepository.team) {
+            this.logger.success('Using existing service repository configuration');
+            this.logger.info(`  Service: ${this.config.serviceRepository.name}`);
+            this.logger.info(`  Domain: ${this.config.serviceRepository.domain}`);
+            this.logger.info(`  Team: ${this.config.serviceRepository.team}`);
         }
         else {
             const inferredName = path.basename(process.cwd());
-            const repoName = await this.ask(`Service repository name [${inferredName}]`);
-            this.config.serviceRepository.name = repoName || inferredName;
-        }
-        this.logger.info(`Using service repository: ${this.config.serviceRepository.name}`);
-        // Get domain, team, and okta groups
-        if (options?.domain) {
-            this.config.serviceRepository.domain = options.domain;
-        }
-        else {
-            this.config.serviceRepository.domain = await this.ask('Domain name (e.g., core-platform, ide, data-platform)');
-        }
-        if (options?.team) {
-            this.config.serviceRepository.team = options.team;
-        }
-        else {
-            this.config.serviceRepository.team = await this.ask('Team name (e.g., infrastructure-developer-experience)');
-        }
-        if (options?.oktaGroups && options.oktaGroups.length > 0) {
-            this.config.serviceRepository.oktaGroups = options.oktaGroups;
-        }
-        else {
-            const oktaGroupsInput = await this.ask('Okta groups (comma-separated, e.g., "Squad - Infrastructure & Developer Experience")');
+            this.config.serviceRepository.name = await this.getOrAskConfig(options?.name, 'Service repository name', inferredName);
+            this.logger.info(`Using service repository: ${this.config.serviceRepository.name}`);
+            this.config.serviceRepository.domain = await this.getOrAskConfig(options?.domain, 'Domain name (e.g., core-platform, ide, data-platform)');
+            this.config.serviceRepository.team = await this.getOrAskConfig(options?.team, 'Team name (e.g., infrastructure-developer-experience)');
+            const oktaGroupsInput = await this.getOrAskConfig(options?.oktaGroups, 'Okta groups (comma-separated, e.g., "Squad - Infrastructure & Developer Experience")');
             this.config.serviceRepository.oktaGroups = oktaGroupsInput
                 .split(',')
                 .map(g => g.trim())
                 .filter(g => g.length > 0);
         }
-        // Clone required repositories to temp directory
         this.logger.info('\nCloning required repositories...');
         if (!this.files.exists(this.paths.tmpDir)) {
             this.files.mkdir(this.paths.tmpDir, { recursive: true });
@@ -93,16 +73,24 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         else {
             this.logger.info('.gitignore already contains migration entries');
         }
-        // Save initial state
-        this.config.migrationStartedAt = new Date().toISOString();
+        // Save initial state (only set timestamp if not resuming)
+        if (!this.config.migrationStartedAt) {
+            this.config.migrationStartedAt = new Date().toISOString();
+        }
         this.saveMigrationState();
     }
     /**
      * Step 2: Load Configuration
-     * Load stacks and ECR repositories from iac-deploy and ecr-deploy
+     * Load stacks from iac-deploy
      */
     async loadConfiguration() {
-        this.logger.step(2, 9, 'Loading Configuration from iac-deploy and ecr-deploy');
+        this.logger.step(2, 9, 'Loading Configuration from iac-deploy');
+        // Check if configuration is already loaded from state
+        if (this.config.resuming && this.config.stacks.length > 0) {
+            this.logger.success(`Configuration already loaded from state (${this.config.stacks.length} stack(s))`);
+            this.logger.info('Skipping file reads as configuration is already available');
+            return;
+        }
         // Load stacks from iac-deploy
         const iacConfigPath = this.paths.iacConfigFile(this.config.serviceRepository.name);
         if (!this.files.exists(iacConfigPath)) {
@@ -115,29 +103,6 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             this.config.stacks = iacConfig.stacks;
             this.logger.success(`Found ${this.config.stacks.length} stack(s) in configuration`);
         }
-        // Load ECR repositories from ecr-deploy
-        const ecrConfigPath = this.paths.ecrConfigFile(constants_1.ECR_DEPLOY_PATHS.ecrRepos);
-        if (this.files.exists(ecrConfigPath)) {
-            this.logger.info(`Reading ECR configuration from ecr-deploy...`);
-            const ecrConfig = this.files.readYaml(ecrConfigPath);
-            const repoSource = `https://github.com/PayFit/${this.config.serviceRepository.name}`;
-            // Filter ECR repos by source
-            for (const [key, value] of Object.entries(ecrConfig)) {
-                if (key === 'payfit_team' || key === 'anchors' || key.startsWith('.'))
-                    continue;
-                const repo = value;
-                if (repo?.source === repoSource) {
-                    this.config.ecrRepositories.push({
-                        name: key,
-                        team: repo.owner || this.config.serviceRepository.team,
-                    });
-                }
-            }
-            this.logger.success(`Found ${this.config.ecrRepositories.length} ECR repository(ies)`);
-        }
-        else {
-            this.logger.info('No ECR configuration found (this is fine)');
-        }
         // Save state
         this.saveMigrationState();
     }
@@ -149,15 +114,9 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         // Skip if already created
         if (this.config.generatedFiles.safetyNetPR) {
             this.logger.success(`Safety net PR already exists: ${this.config.generatedFiles.safetyNetPR.url}`);
-            const shouldContinue = await this.confirm('\nHas this PR been merged?', false);
-            if (!shouldContinue) {
-                this.logger.warn('Please merge the safety net PR before continuing');
-                this.logger.info('Run this script again when ready');
-                process.exit(0);
-            }
             return;
         }
-        this.logger.info('\nThis PR will set autodeploy=false for all stacks to prevent unwanted changes during migration');
+        this.logger.info(templates_1.MessageTemplates.SAFETY_NET_DESCRIPTION);
         const iacConfigPath = this.paths.iacConfigFile(this.config.serviceRepository.name);
         // Read the current config
         const iacConfig = this.files.readYaml(iacConfigPath);
@@ -181,7 +140,7 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             return;
         }
         // Create branch
-        const branchName = `safety-net-${this.config.serviceRepository.name}-${Date.now()}`;
+        const branchName = this.generateBranchName(`safety-net-${this.config.serviceRepository.name}`);
         await this.git.createBranch(branchName, this.config.repositories.iacDeploy);
         // Update all stacks to have autodeploy: false
         this.files.updateAutodeployInYaml(iacConfigPath, false);
@@ -196,17 +155,9 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             branch: branchName,
             url: prUrl,
         };
-        // Save state after creating PR
         this.saveMigrationState();
         this.logger.success(`Safety net PR created: ${prUrl}`);
-        this.logger.warn('\nIMPORTANT: Merge this PR before continuing with migration');
-        const shouldContinue = await this.confirm('\nHave you merged the safety net PR?', false);
-        if (!shouldContinue) {
-            this.logger.warn('Please merge the safety net PR before continuing');
-            this.logger.info('Run this script again when ready');
-            process.exit(0);
-        }
-        this.logger.success('Safety net PR merged - stacks are now safe from changes');
+        this.logger.warn(templates_1.MessageTemplates.SAFETY_NET_IMPORTANT);
     }
     /**
      * Step 4: Create Domain Enrollment PR
@@ -218,9 +169,7 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             this.logger.success(`Domain enrollment PR already exists: ${this.config.generatedFiles.domainEnrollmentPR.url}`);
             const shouldContinue = await this.confirm('\nHas this PR been merged?', false);
             if (!shouldContinue) {
-                this.logger.warn('Please merge the PR before continuing');
-                this.logger.info('Run this script again when ready');
-                process.exit(0);
+                this.exitWithMessage('Please merge the PR before continuing');
             }
             return;
         }
@@ -299,7 +248,7 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         }
         // Only create branch and commit if there are changes
         if (needsEnrollment) {
-            const branchName = `enroll-${this.config.serviceRepository.name}-${Date.now()}`;
+            const branchName = this.generateBranchName(`enroll-${this.config.serviceRepository.name}`);
             await this.git.createBranch(branchName, this.config.repositories.domainEnrollment);
             await this.git.add(['.'], this.config.repositories.domainEnrollment);
             await this.git.commit(`feat: enroll ${this.config.serviceRepository.name} in ${this.config.serviceRepository.domain} domain`, this.config.repositories.domainEnrollment);
@@ -312,7 +261,6 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
                 branch: branchName,
                 url: prUrl,
             };
-            // Save state after creating PR
             this.saveMigrationState();
             this.logger.info('\nNext steps for domain enrollment:');
             this.logger.info(`1. Review PR: ${prUrl}`);
@@ -320,11 +268,9 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             this.logger.info('3. Merge PR to deploy repository metastack');
             const shouldContinue = await this.confirm('\nHave you merged the domain enrollment PR?', false);
             if (!shouldContinue) {
-                this.logger.warn('Please merge the PR before continuing');
-                this.logger.info('Run this script again when ready');
-                process.exit(0);
+                this.exitWithMessage('Please merge the PR before continuing');
             }
-            this.logger.success('Domain enrollment PR merged - metastack should be deploying');
+            this.logger.success(templates_1.MessageTemplates.DOMAIN_ENROLLMENT_SUCCESS);
         }
         else {
             this.logger.success('Repository already enrolled - skipping domain enrollment PR');
@@ -333,8 +279,8 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             // Save state after marking enrollment as done
             this.saveMigrationState();
             // Check if metastack exists
-            this.logger.info('\nAssuming metastack already exists for this repository');
-            const shouldContinue = await this.confirm('Continue with migration? (metastack should already be deployed)', true);
+            this.logger.info(templates_1.MessageTemplates.DOMAIN_ENROLLMENT_ALREADY_EXISTS);
+            const shouldContinue = await this.confirm(templates_1.MessageTemplates.DOMAIN_ENROLLMENT_CONFIRM, true);
             if (!shouldContinue) {
                 this.logger.info('Exiting migration');
                 process.exit(0);
@@ -342,10 +288,10 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         }
     }
     /**
-     * Step 5: Create Service Repository PR (spacelift.yaml, ecr.yaml, import.tf)
+     * Step 5: Create Service Repository PR (spacelift.yaml, import.tf)
      */
     async createServiceRepositoryPR() {
-        this.logger.step(5, 9, 'Create Service Repository PR (spacelift.yaml, ecr.yaml, .metastack/import.tf)');
+        this.logger.step(5, 9, 'Create Service Repository PR (spacelift.yaml, .metastack/import.tf)');
         // Create safety net PR first if not already created
         if (!this.config.generatedFiles.safetyNetPR) {
             this.logger.info('\nSafety net PR not yet created, creating it first...');
@@ -354,7 +300,7 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         // Skip if already created
         if (this.config.generatedFiles.serviceRepoPR) {
             this.logger.success(`Service repository PR already exists: ${this.config.generatedFiles.serviceRepoPR.url}`);
-            this.logger.warn('Remember: DO NOT MERGE THIS PR until cleanup PRs are merged');
+            this.logger.warn(templates_1.MessageTemplates.SERVICE_REPO_NOT_MERGE_WARNING);
             return;
         }
         // Ask for confirmation before creating PRs
@@ -370,18 +316,6 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         if (!this.dryRun) {
             this.logger.success('Created spacelift.yaml');
         }
-        // Create ecr.yaml
-        if (this.config.ecrRepositories.length > 0) {
-            const ecrData = {
-                payfit_team: this.config.serviceRepository.team,
-                repositories: this.config.ecrRepositories.map(r => ({ name: r.name })),
-            };
-            const ecrPath = this.paths.serviceRepoEcrYaml();
-            this.files.writeYaml(ecrPath, ecrData);
-            if (!this.dryRun) {
-                this.logger.success('Created ecr.yaml');
-            }
-        }
         // Create .metastack/import.tf
         await this.generateImportTf();
         // Update .gitignore to exclude migration temporary files
@@ -399,10 +333,10 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             }
         }
         // Create branch and commit
-        const branchName = `metastack-migration-${Date.now()}`;
+        const branchName = this.generateBranchName('metastack-migration');
         await this.git.createBranch(branchName, this.config.serviceRepository.path);
-        await this.git.add(['spacelift.yaml', 'ecr.yaml', '.metastack/', '.gitignore'], this.config.serviceRepository.path);
-        await this.git.commit(`feat: migrate to metastack\n\nAdd spacelift.yaml, ecr.yaml, and import.tf for metastack migration`, this.config.serviceRepository.path);
+        await this.git.add(['spacelift.yaml', '.metastack/', '.gitignore'], this.config.serviceRepository.path);
+        await this.git.commit(`feat: migrate to metastack\n\nAdd spacelift.yaml and import.tf for metastack migration`, this.config.serviceRepository.path);
         if (!this.dryRun) {
             this.logger.success(`Created branch: ${branchName}`);
         }
@@ -412,18 +346,19 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             branch: branchName,
             url: prUrl,
         };
-        // Save state after creating PR
         this.saveMigrationState();
-        this.logger.warn('\nDO NOT MERGE THIS PR YET');
-        this.logger.info('This PR will be merged after cleaning old resources');
+        this.logger.warn(templates_1.MessageTemplates.CLEANUP_PR_NOT_MERGE_WARNING);
+        this.logger.info(templates_1.MessageTemplates.CLEANUP_PR_MERGE_TIMING);
         this.logger.info(`PR URL: ${prUrl}`);
     }
     /**
-     * Generate import.tf file with import blocks for stacks and ECR repositories
+     * Generate import.tf file with import blocks for stacks
      */
     async generateImportTf() {
         const metastackDir = this.paths.metastackDir;
         this.files.mkdir(metastackDir, { recursive: true });
+        // Ensure spacectl is authenticated before fetching resources
+        await this.ensureSpacectlAuthentication();
         this.logger.info('Fetching stack resources from projects-manager...');
         // Fetch all resources from projects-manager
         let projectManagerResources = '';
@@ -438,28 +373,12 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         let importTf = `# Import existing resources to metastack
 # Generated by migrate-to-metastack.ts
 # This file contains import blocks for:
-# - ECR repositories
 # - Spacelift stacks
 # - AWS integration attachments
 # - Context attachments
 # - Stack dependencies
 
 `;
-        // Import ECR repositories
-        if (this.config.ecrRepositories.length > 0) {
-            importTf += `# ==============================================================================
-# ECR Repositories
-# ==============================================================================
-`;
-            for (const repo of this.config.ecrRepositories) {
-                importTf += `import {
-  to = module.ecr_private["${repo.name}"].aws_ecr_repository.this
-  id = "${repo.name}"
-}
-
-`;
-            }
-        }
         // Import Stacks and their attachments
         if (this.config.stacks.length > 0) {
             importTf += `# ==============================================================================
@@ -475,8 +394,8 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
 # 4. Stack dependencies (if any)
 \n`;
             for (const stack of this.config.stacks) {
-                const stackId = `${stack.identifier}-${stack.environment}${stack.region ? `-${stack.region}` : ''}`;
-                const moduleKey = `${stack.identifier}-${stack.environment}${stack.region ? `-${stack.region}` : ''}`;
+                const stackId = this.getStackModuleKey(stack);
+                const moduleKey = this.getStackModuleKey(stack);
                 this.logger.info(`  Processing stack: ${stackId}`);
                 // Parse resources to extract attachments for this specific stack module
                 const { contexts, dependencies } = this.parseStackModuleResources(projectManagerResources, moduleKey);
@@ -554,9 +473,6 @@ import {
         if (!this.dryRun) {
             this.logger.success('Created .metastack/import.tf with import blocks');
             this.logger.info(`  Total stacks: ${this.config.stacks.length}`);
-            if (this.config.ecrRepositories.length > 0) {
-                this.logger.info(`  Total ECR repositories: ${this.config.ecrRepositories.length}`);
-            }
         }
     }
     /**
@@ -628,24 +544,20 @@ import {
         return { contexts, dependencies };
     }
     /**
-     * Step 6: Create Cleanup PRs for iac-deploy and ecr-deploy
+     * Step 6: Create Cleanup PR for iac-deploy
      */
     async createCleanupPRs() {
-        this.logger.step(6, 9, 'Create Cleanup PRs for iac-deploy and ecr-deploy (remove old resources)');
-        // Ask for confirmation before creating cleanup PRs
-        const shouldCreate = await this.confirm('\nCreate and push cleanup PRs (iac-deploy and ecr-deploy)?', true);
+        this.logger.step(6, 9, 'Create Cleanup PR for iac-deploy (remove old resources)');
+        // Ask for confirmation before creating cleanup PR
+        const shouldCreate = await this.confirm('\nCreate and push cleanup PR (iac-deploy)?', true);
         if (!shouldCreate) {
             this.logger.warn('Skipping cleanup PR creation');
             return;
         }
-        // iac-deploy cleanup
         await this.createIacDeployCleanupPR();
-        // ecr-deploy cleanup
-        if (this.config.ecrRepositories.length > 0) {
-            await this.createEcrDeployCleanupPR();
-        }
-        this.logger.warn('\nDO NOT MERGE THESE PRs YET');
-        this.logger.info('State removal commands must be run first');
+        await this.generateMigrationProcedure();
+        this.logger.warn(templates_1.MessageTemplates.CLEANUP_PR_NOT_MERGE_WARNING);
+        this.logger.info(templates_1.MessageTemplates.CLEANUP_PR_STATE_REMOVAL_WARNING);
     }
     /**
      * Create cleanup PR for iac-deploy
@@ -656,7 +568,7 @@ import {
         // Remove the config file
         const shouldDelete = await this.confirm(`Delete ${this.config.serviceRepository.name}.yaml from iac-deploy?`, true);
         if (shouldDelete) {
-            const branchName = `cleanup-${this.config.serviceRepository.name}-${Date.now()}`;
+            const branchName = this.generateBranchName(`cleanup-${this.config.serviceRepository.name}`);
             await this.git.createBranch(branchName, this.config.repositories.iacDeploy);
             this.files.deleteFile(configPath);
             await this.git.add(['.'], this.config.repositories.iacDeploy);
@@ -670,42 +582,6 @@ import {
                 branch: branchName,
                 url: prUrl,
             };
-            // Save state after creating PR
-            this.saveMigrationState();
-            this.logger.info(`PR URL: ${prUrl}`);
-        }
-    }
-    /**
-     * Create cleanup PR for ecr-deploy
-     */
-    async createEcrDeployCleanupPR() {
-        this.logger.info('\nCreating ecr-deploy cleanup PR...');
-        const ecrConfigPath = this.paths.ecrConfigFile(constants_1.ECR_DEPLOY_PATHS.ecrRepos);
-        // Check which repositories need to be removed
-        const ecrConfig = this.files.readYaml(ecrConfigPath);
-        const reposToRemove = this.config.ecrRepositories
-            .map(r => r.name)
-            .filter(name => ecrConfig[name] !== undefined);
-        if (reposToRemove.length > 0) {
-            reposToRemove.forEach(name => {
-                this.logger.info(`  Will remove ${name}`);
-            });
-            const branchName = `cleanup-${this.config.serviceRepository.name}-ecr-${Date.now()}`;
-            await this.git.createBranch(branchName, this.config.repositories.ecrDeploy);
-            // Use removeYamlKeys to preserve file formatting
-            this.files.removeYamlKeys(ecrConfigPath, reposToRemove);
-            await this.git.add(['.'], this.config.repositories.ecrDeploy);
-            await this.git.commit(`chore: remove ECR repos for ${this.config.serviceRepository.name} (migrated to metastack)`, this.config.repositories.ecrDeploy);
-            if (!this.dryRun) {
-                this.logger.success(`Created ecr-deploy cleanup branch: ${branchName}`);
-            }
-            // Push and create draft PR
-            const prUrl = await this.git.createPR(branchName, `chore: remove ECR repos for ${this.config.serviceRepository.name} (migrated to metastack)`, templates_1.PRTemplates.ecrDeployCleanupPRBody(this.config.serviceRepository.name, this.config.ecrRepositories.length), this.config.repositories.ecrDeploy);
-            this.config.generatedFiles.ecrDeployPR = {
-                branch: branchName,
-                url: prUrl,
-            };
-            // Save state after creating PR
             this.saveMigrationState();
             this.logger.info(`PR URL: ${prUrl}`);
         }
@@ -720,18 +596,6 @@ import {
 # They use spacectl to safely remove resources from Terraform state
 
 `;
-        // ECR state removal from ecr-deploy-shared-eu-west-3
-        if (this.config.ecrRepositories.length > 0) {
-            commands += `# Remove ECR repositories from ecr-deploy-shared-eu-west-3 stack
-# These repositories will be managed by the metastack after migration
-# The underlying ECR repositories remain untouched
-
-`;
-            for (const repo of this.config.ecrRepositories) {
-                commands += `spacectl stack task --id="${constants_1.STACK_MANAGERS.ecrDeployShared}" --command="tofu state rm 'module.ecr_private[\\"${repo.name}\\"]'"\n`;
-            }
-            commands += `\n`;
-        }
         // Stack state removal from projects-manager
         if (this.config.stacks.length > 0) {
             commands += `# Remove stack definitions from projects-manager
@@ -741,7 +605,7 @@ import {
 
 `;
             for (const stack of this.config.stacks) {
-                const moduleKey = `${stack.identifier}-${stack.environment}${stack.region ? `-${stack.region}` : ''}`;
+                const moduleKey = this.getStackModuleKey(stack);
                 commands += `spacectl stack task --id="${constants_1.STACK_MANAGERS.projectsManager}" --command="tofu state rm 'module.stacks_generator[\\"${moduleKey}\\"]'"\n`;
             }
             commands += `\n`;
@@ -753,7 +617,7 @@ import {
             this.config.generatedFiles.stateRemovalCommands = commandsPath;
             // Save state after generating commands
             this.saveMigrationState();
-            this.logger.info('\nReview these commands carefully before executing');
+            this.logger.info(templates_1.MessageTemplates.STATE_REMOVAL_REVIEW_WARNING);
         }
     }
     /**
@@ -761,17 +625,19 @@ import {
      */
     async updateStackSpaces() {
         this.logger.step(8, 9, 'Update Stack Spaces (Move stacks to domain space)');
-        this.logger.info('\nThis step will update the space for all stacks to the newly created domain space.');
-        this.logger.info('This is needed because stacks in the old space cannot be imported by the metastack.');
+        this.logger.info(templates_1.MessageTemplates.STACK_SPACES_DESCRIPTION);
+        this.logger.info(templates_1.MessageTemplates.STACK_SPACES_REASON);
         this.logger.info('');
-        this.logger.warn('IMPORTANT: Run this AFTER state removal commands and BEFORE merging cleanup PRs.');
+        this.logger.warn(templates_1.MessageTemplates.STACK_SPACES_IMPORTANT_TIMING);
         this.logger.info('');
         const shouldUpdate = await this.confirm('Update stack spaces now?', false);
         if (!shouldUpdate) {
             this.logger.warn('Skipping stack space update');
-            this.logger.info('You can run this step later by calling the updateStackSpaces function manually');
+            this.logger.info(templates_1.MessageTemplates.STACK_SPACES_SKIP_LATER);
             return;
         }
+        // Ensure spacectl is authenticated before making API calls
+        await this.ensureSpacectlAuthentication();
         // Determine the target space name
         const targetSpaceName = `domain-${this.config.serviceRepository.domain}`;
         this.logger.info(`Target space: ${targetSpaceName}`);
@@ -780,7 +646,7 @@ import {
             this.logger.info(`  Target space: ${targetSpaceName}`);
             this.logger.info(`  Stacks to update: ${this.config.stacks.length}`);
             for (const stack of this.config.stacks) {
-                const stackId = `${stack.identifier}-${stack.environment}${stack.region ? `-${stack.region}` : ''}`;
+                const stackId = this.getStackModuleKey(stack);
                 this.logger.info(`    - ${stackId}`);
             }
             return;
@@ -798,7 +664,7 @@ import {
         this.logger.info(`\nUpdating ${this.config.stacks.length} stacks...`);
         const results = [];
         for (const stack of this.config.stacks) {
-            const stackId = `${stack.identifier}-${stack.environment}${stack.region ? `-${stack.region}` : ''}`;
+            const stackId = this.getStackModuleKey(stack);
             try {
                 // Check current space
                 const currentStack = await client.getStack(stackId);
@@ -895,10 +761,6 @@ import {
                 name: 'iac-deploy Cleanup',
                 pr: this.config.generatedFiles.iacDeployPR,
             },
-            {
-                name: 'ecr-deploy Cleanup',
-                pr: this.config.generatedFiles.ecrDeployPR,
-            },
         ];
         for (const { name, pr } of prs) {
             if (pr) {
@@ -979,7 +841,13 @@ import {
         this.logger.info('This tool will guide you through the metastack migration');
         this.logger.info('');
         if (this.dryRun) {
-            this.logger.warn('DRY RUN MODE - No changes will be made');
+            this.logger.warn(templates_1.MessageTemplates.DRY_RUN_MODE_WARNING);
+            this.logger.info('');
+        }
+        // Load existing migration state if available
+        const hasExistingState = this.loadMigrationState();
+        if (hasExistingState) {
+            this.logger.info('Resuming from existing migration state');
             this.logger.info('');
         }
         await this.setupRepositories();
@@ -989,8 +857,6 @@ import {
         await this.createServiceRepositoryPR();
         await this.createCleanupPRs();
         await this.generateStateRemovalCommands();
-        // Optional: Update stack spaces
-        await this.updateStackSpaces();
         await this.generateMigrationProcedure();
         this.logger.section('Migration Setup Complete!');
         this.logger.success('All preparation complete');
@@ -1009,20 +875,19 @@ import {
         if (this.config.generatedFiles.iacDeployPR) {
             this.logger.info(`  iac-deploy Cleanup: ${this.config.generatedFiles.iacDeployPR.url}`);
         }
-        if (this.config.generatedFiles.ecrDeployPR) {
-            this.logger.info(`  ecr-deploy Cleanup: ${this.config.generatedFiles.ecrDeployPR.url}`);
-        }
         this.logger.info('');
         this.logger.info('Generated files:');
         this.logger.info(`  - ${this.config.generatedFiles.migrationProcedure}`);
         this.logger.info(`  - ${this.config.generatedFiles.stateRemovalCommands}`);
         this.logger.info('');
-        this.logger.warn('NEXT STEPS:');
+        this.logger.warn(templates_1.MessageTemplates.FINAL_WORKFLOW_NEXT_STEPS);
         this.logger.info('1. Review the PRs above');
         this.logger.info('2. Review METASTACK_MIGRATION_PROCEDURE.md');
-        this.logger.info('3. Follow the migration procedure EXACTLY');
+        this.logger.info('3. Execute state removal commands from METASTACK_STATE_REMOVAL_COMMANDS.sh');
+        this.logger.info('4. Run migrate-spaces command manually: nx run <project>:stack-migration --command=migrate-spaces');
+        this.logger.info('5. Follow the migration procedure to merge PRs in correct order');
         this.logger.info('');
-        this.logger.warn('IMPORTANT: Execute steps in the correct order!');
+        this.logger.warn(templates_1.MessageTemplates.FINAL_WORKFLOW_EXECUTE_ORDER_WARNING);
         this.logger.info('');
         this.logger.info('Note: Migration state saved to .migration-state.json for resumability');
     }