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

package/dist/executors/stack-migration/lib/types.d.ts

@@ -1,6 +1,3 @@
-/**
- * Type definitions for stack migration
- */
 export interface MigrationConfig {
     serviceRepository: {
         name: string;
@@ -12,17 +9,14 @@ export interface MigrationConfig {
     repositories: {
         domainEnrollment: string;
         iacDeploy: string;
-        ecrDeploy: string;
     };
     stacks: Stack[];
-    ecrRepositories: ECRRepository[];
     generatedFiles: {
         safetyNetPR?: PullRequestInfo;
         domainEnrollmentPR?: PullRequestInfo;
         domainEnrollmentAlreadyDone?: boolean;
         serviceRepoPR?: PullRequestInfo;
         iacDeployPR?: PullRequestInfo;
-        ecrDeployPR?: PullRequestInfo;
         stateRemovalCommands?: string;
         migrationProcedure?: string;
     };
@@ -35,9 +29,6 @@ export interface Stack {
     region?: string;
     autodeploy?: boolean;
 }
-export interface ECRRepository {
-    name: string;
-}
 export interface PullRequestInfo {
     branch: string;
     url: string;

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

@@ -1,6 +1,3 @@
 "use strict";
-/**
- * Type definitions for stack migration
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=types.js.map

package/dist/executors/stack-migration/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/executors/stack-migration/lib/types.ts"],"names":[],"mappings":";AAAA;;GAEG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/executors/stack-migration/lib/types.ts"],"names":[],"mappings":""}

package/dist/executors/stack-migration/schema.d.ts

@@ -3,12 +3,13 @@ export interface StackMigrationExecutorSchema {
     | 'init'
     | 'state'
     | 'enroll'
-    | 'generate-import'
+    | 'generate-tf-migration'
     | 'migrate-spaces'
     | 'cleanup-pr'
     | 'generate-procedure'
     | 'migration-cleanup'
     | 'run'
+    | 'help'
   dryRun?: boolean
   serviceRepository?: {
     name?: string

package/dist/executors/stack-migration/schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/schema",
   "version": 2,
   "title": "Stack Migration to Metastack executor",
-  "description": "Migrate Spacelift stacks from iac-deploy/ecr-deploy to repository-level metastacks",
+  "description": "Migrate Spacelift stacks from iac-deploy to repository-level metastacks",
   "type": "object",
   "properties": {
     "command": {
@@ -12,12 +12,13 @@
         "init",
         "state",
         "enroll",
-        "generate-import",
+        "generate-tf-migration",
         "migrate-spaces",
         "cleanup-pr",
         "generate-procedure",
         "migration-cleanup",
-        "run"
+        "run",
+        "help"
       ],
       "default": "run"
     },

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

@@ -1,102 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const migration_tool_1 = require("./lib/migration-tool");
+const templates_1 = require("./lib/templates");
 const runExecutor = async (options, context) => {
     const { command = 'run', dryRun = false, serviceRepository } = options;
     try {
-        // Get the project root path
         const projectRoot = context.projectsConfigurations?.projects[context.projectName]?.root ||
             context.root;
-        // Create migration tool instance
         const tool = new migration_tool_1.MigrationTool(dryRun, projectRoot);
-        // Route to appropriate command
+        const requireState = async (action) => {
+            if (!tool.loadMigrationState()) {
+                tool.logger.error('No migration state found');
+                tool.logger.info('Run: nx run <project>:stack-migration --command=init');
+                return { success: false };
+            }
+            await tool.loadConfiguration();
+            await action();
+            return null;
+        };
+        let result = null;
         switch (command) {
             case 'init':
                 await tool.setupRepositories(serviceRepository);
+                await tool.loadConfiguration();
                 tool.logger.success('\nMigration initialized successfully!');
                 tool.logger.info('\nNext steps: Run individual steps or full workflow');
+                tool.logger.info('  nx run <project>:stack-migration --command=help');
                 tool.logger.info('  nx run <project>:stack-migration --command=state');
                 break;
             case 'state':
                 await tool.checkMigrationState();
                 break;
             case 'enroll':
-                {
-                    const hasState = tool.loadMigrationState();
-                    if (!hasState) {
-                        tool.logger.error('No migration state found');
-                        tool.logger.info('Run: nx run <project>:stack-migration --command=init');
-                        return { success: false };
-                    }
-                    await tool.loadConfiguration();
-                    await tool.createDomainEnrollmentPR();
-                }
+                result = await requireState(() => tool.createDomainEnrollmentPR());
                 break;
-            case 'generate-import':
-                {
-                    const hasState = tool.loadMigrationState();
-                    if (!hasState) {
-                        tool.logger.error('No migration state found');
-                        tool.logger.info('Run: nx run <project>:stack-migration --command=init');
-                        return { success: false };
-                    }
-                    await tool.loadConfiguration();
+            case 'generate-tf-migration':
+                result = await requireState(async () => {
                     await tool.createServiceRepositoryPR();
-                }
+                    await tool.generateStateRemovalCommands();
+                });
                 break;
             case 'migrate-spaces':
-                {
-                    const hasState = tool.loadMigrationState();
-                    if (!hasState) {
-                        tool.logger.error('No migration state found');
-                        tool.logger.info('Run: nx run <project>:stack-migration --command=init');
-                        return { success: false };
-                    }
-                    await tool.loadConfiguration();
-                    await tool.updateStackSpaces();
-                }
+                result = await requireState(() => tool.updateStackSpaces());
                 break;
             case 'cleanup-pr':
-                {
-                    const hasState = tool.loadMigrationState();
-                    if (!hasState) {
-                        tool.logger.error('No migration state found');
-                        tool.logger.info('Run: nx run <project>:stack-migration --command=init');
-                        return { success: false };
-                    }
-                    await tool.loadConfiguration();
-                    await tool.createCleanupPRs();
-                }
+                result = await requireState(() => tool.createCleanupPRs());
                 break;
             case 'generate-procedure':
-                {
-                    const hasState = tool.loadMigrationState();
-                    if (!hasState) {
-                        tool.logger.error('No migration state found');
-                        tool.logger.info('Run: nx run <project>:stack-migration --command=init');
-                        return { success: false };
-                    }
-                    await tool.loadConfiguration();
-                    await tool.generateMigrationProcedure();
-                }
+                result = await requireState(() => tool.generateMigrationProcedure());
                 break;
             case 'migration-cleanup':
-                {
-                    // Try to load state, but cleanup can work without it
-                    tool.loadMigrationState();
-                    await tool.cleanupMigration();
-                }
+                tool.loadMigrationState();
+                await tool.cleanupMigration();
                 break;
             case 'run':
                 await tool.run();
                 break;
+            case 'help':
+                tool.logger.section('Stack Migration Tool - Help');
+                tool.logger.info(templates_1.MessageTemplates.HELP_TEXT);
+                break;
             default:
                 tool.logger.error(`Unknown command: ${command}`);
+                tool.logger.info('\nRun --command=help for usage information');
                 return { success: false };
         }
-        // Close readline interface if it was opened
         tool.closeReadline();
-        return { success: true };
+        return result || { success: true };
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);

package/dist/executors/stack-migration/stack-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"stack-migration.js","sourceRoot":"","sources":["../../../src/executors/stack-migration/stack-migration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stack-migration.js","sourceRoot":"","sources":["../../../src/executors/stack-migration/stack-migration.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/iac",
-  "version": "1.0.0-ephemeral-migration-scripts.7",
+  "version": "1.0.0-ephemeral-migration-scripts.8",
   "publishConfig": {
     "access": "restricted"
   },
@@ -18,7 +18,8 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "js-yaml": "^4.1.0",
-    "tslib": "^2.3.0"
+    "tslib": "^2.3.0",
+    "vitest": "4.0.16"
   },
   "peerDependencies": {
     "@nx/devkit": "^22"