@friggframework/devtools 2.0.0--canary.474.884529c.0 → 2.0.0--canary.474.988ec0b.0

package/frigg-cli/deploy-command/index.js

@@ -2,6 +2,9 @@ const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
+// Import doctor command for post-deployment health check
+const { doctorCommand } = require('../doctor-command');
+
 // Configuration constants
 const PATHS = {
     APP_DEFINITION: 'index.js',
@@ -134,41 +137,134 @@ function validateAndBuildEnvironment(appDefinition, options) {
  * Executes the serverless deployment command
  * @param {Object} environment - Environment variables to pass to serverless
  * @param {Object} options - Deploy command options
+ * @returns {Promise<number>} Exit code
  */
 function executeServerlessDeployment(environment, options) {
-    console.log('🚀 Deploying serverless application...');
-
-    const serverlessArgs = [
-        'deploy',
-        '--config',
-        PATHS.INFRASTRUCTURE,
-        '--stage',
-        options.stage,
-    ];
-
-    // Add --force flag if force option is true
-    if (options.force === true) {
-        serverlessArgs.push('--force');
-    }
+    return new Promise((resolve, reject) => {
+        console.log('🚀 Deploying serverless application...');
 
-    const childProcess = spawn(COMMANDS.SERVERLESS, serverlessArgs, {
-        cwd: path.resolve(process.cwd()),
-        stdio: 'inherit',
-        env: {
-            ...environment,
-            SLS_STAGE: options.stage, // Set stage for resource discovery
-        },
-    });
+        const serverlessArgs = [
+            'deploy',
+            '--config',
+            PATHS.INFRASTRUCTURE,
+            '--stage',
+            options.stage,
+        ];
+
+        // Add --force flag if force option is true
+        if (options.force === true) {
+            serverlessArgs.push('--force');
+        }
 
-    childProcess.on('error', (error) => {
-        console.error(`Error executing command: ${error.message}`);
+        const childProcess = spawn(COMMANDS.SERVERLESS, serverlessArgs, {
+            cwd: path.resolve(process.cwd()),
+            stdio: 'inherit',
+            env: {
+                ...environment,
+                SLS_STAGE: options.stage, // Set stage for resource discovery
+            },
+        });
+
+        childProcess.on('error', (error) => {
+            console.error(`Error executing command: ${error.message}`);
+            reject(error);
+        });
+
+        childProcess.on('close', (code) => {
+            if (code !== 0) {
+                console.log(`Child process exited with code ${code}`);
+                resolve(code);
+            } else {
+                resolve(0);
+            }
+        });
     });
+}
+
+/**
+ * Get stack name from app definition
+ * @param {Object} appDefinition - App definition
+ * @param {Object} options - Deploy options
+ * @returns {string|null} Stack name
+ */
+function getStackName(appDefinition, options) {
+    // Try to get from app definition
+    if (appDefinition?.name) {
+        const stage = options.stage || 'dev';
+        return `${appDefinition.name}-${stage}`;
+    }
 
-    childProcess.on('close', (code) => {
-        if (code !== 0) {
-            console.log(`Child process exited with code ${code}`);
+    // Try to get from infrastructure.js
+    const infraPath = path.join(process.cwd(), PATHS.INFRASTRUCTURE);
+    if (fs.existsSync(infraPath)) {
+        try {
+            const infraModule = require(infraPath);
+            if (infraModule.service) {
+                const stage = options.stage || 'dev';
+                return `${infraModule.service}-${stage}`;
+            }
+        } catch (error) {
+            // Ignore errors reading infrastructure file
         }
-    });
+    }
+
+    return null;
+}
+
+/**
+ * Run post-deployment health check
+ * @param {string} stackName - CloudFormation stack name
+ * @param {Object} options - Deploy options
+ */
+async function runPostDeploymentHealthCheck(stackName, options) {
+    console.log('\n' + '═'.repeat(80));
+    console.log('Running post-deployment health check...');
+    console.log('═'.repeat(80));
+
+    try {
+        // Run doctor command (will exit process on its own)
+        // Note: We need to catch the exit to prevent deploy from exiting
+        const originalExit = process.exit;
+        let doctorExitCode = 0;
+
+        // Temporarily override process.exit to capture exit code
+        process.exit = (code) => {
+            doctorExitCode = code || 0;
+        };
+
+        try {
+            await doctorCommand(stackName, {
+                region: options.region,
+                format: 'console',
+                verbose: options.verbose,
+            });
+        } catch (error) {
+            console.log(`\n⚠️  Health check encountered an error: ${error.message}`);
+            if (options.verbose) {
+                console.error(error.stack);
+            }
+        } finally {
+            // Restore original process.exit
+            process.exit = originalExit;
+        }
+
+        // Inform user about health check results
+        if (doctorExitCode === 0) {
+            console.log('\n✓ Post-deployment health check: PASSED');
+        } else if (doctorExitCode === 2) {
+            console.log('\n⚠️  Post-deployment health check: DEGRADED');
+            console.log('   Run "frigg repair" to fix detected issues');
+        } else {
+            console.log('\n✗ Post-deployment health check: FAILED');
+            console.log('   Run "frigg doctor" for detailed report');
+            console.log('   Run "frigg repair" to fix detected issues');
+        }
+    } catch (error) {
+        console.log(`\n⚠️  Post-deployment health check failed: ${error.message}`);
+        if (options.verbose) {
+            console.error(error.stack);
+        }
+    }
 }
 
 async function deployCommand(options) {
@@ -177,7 +273,30 @@ async function deployCommand(options) {
     const appDefinition = loadAppDefinition();
     const environment = validateAndBuildEnvironment(appDefinition, options);
 
-    executeServerlessDeployment(environment, options);
+    // Execute deployment
+    const exitCode = await executeServerlessDeployment(environment, options);
+
+    // Check if deployment was successful
+    if (exitCode !== 0) {
+        console.error(`\n✗ Deployment failed with exit code ${exitCode}`);
+        process.exit(exitCode);
+    }
+
+    console.log('\n✓ Deployment completed successfully!');
+
+    // Run post-deployment health check (unless --skip-doctor)
+    if (!options.skipDoctor) {
+        const stackName = getStackName(appDefinition, options);
+
+        if (stackName) {
+            await runPostDeploymentHealthCheck(stackName, options);
+        } else {
+            console.log('\n⚠️  Could not determine stack name - skipping health check');
+            console.log('   Run "frigg doctor <stack-name>" manually to check stack health');
+        }
+    } else {
+        console.log('\n⏭️  Skipping post-deployment health check (--skip-doctor)');
+    }
 }
 
 module.exports = { deployCommand };

package/frigg-cli/doctor-command/index.js

@@ -0,0 +1,249 @@
+/**
+ * Frigg Doctor Command
+ *
+ * Performs comprehensive health check on deployed CloudFormation stack
+ * and reports issues like property drift, orphaned resources, and missing resources.
+ *
+ * Usage:
+ *   frigg doctor <stack-name>
+ *   frigg doctor my-app-prod --region us-east-1
+ *   frigg doctor my-app-prod --format json --output report.json
+ */
+
+const path = require('path');
+const fs = require('fs');
+
+// Domain and Application Layer
+const StackIdentifier = require('@friggframework/devtools/infrastructure/domains/health/domain/value-objects/stack-identifier');
+const RunHealthCheckUseCase = require('@friggframework/devtools/infrastructure/domains/health/application/use-cases/run-health-check-use-case');
+
+// Infrastructure Layer - AWS Adapters
+const AWSStackRepository = require('@friggframework/devtools/infrastructure/domains/health/infrastructure/adapters/aws-stack-repository');
+const AWSResourceDetector = require('@friggframework/devtools/infrastructure/domains/health/infrastructure/adapters/aws-resource-detector');
+
+// Domain Services
+const MismatchAnalyzer = require('@friggframework/devtools/infrastructure/domains/health/domain/services/mismatch-analyzer');
+const HealthScoreCalculator = require('@friggframework/devtools/infrastructure/domains/health/domain/services/health-score-calculator');
+
+/**
+ * Format health report for console output
+ * @param {StackHealthReport} report - Health check report
+ * @param {Object} options - Formatting options
+ * @returns {string} Formatted output
+ */
+function formatConsoleOutput(report, options = {}) {
+    const lines = [];
+    const summary = report.getSummary();
+
+    // Header
+    lines.push('');
+    lines.push('═'.repeat(80));
+    lines.push(`  FRIGG DOCTOR - Stack Health Report`);
+    lines.push('═'.repeat(80));
+    lines.push('');
+
+    // Stack Information
+    lines.push(`Stack:        ${summary.stackName}`);
+    lines.push(`Region:       ${summary.region}`);
+    lines.push(`Timestamp:    ${summary.timestamp}`);
+    lines.push('');
+
+    // Health Score
+    const scoreIcon = report.healthScore.isHealthy() ? '✓' : report.healthScore.isUnhealthy() ? '✗' : '⚠';
+    const scoreColor = report.healthScore.isHealthy() ? '' : '';
+    lines.push(`Health Score: ${scoreIcon} ${summary.healthScore}/100 (${summary.qualitativeAssessment})`);
+    lines.push('');
+
+    // Summary Statistics
+    lines.push('─'.repeat(80));
+    lines.push('Resources:');
+    lines.push(`  Total:      ${summary.resourceCount}`);
+    lines.push(`  In Stack:   ${report.getResourcesInStack().length}`);
+    lines.push(`  Drifted:    ${summary.driftedResourceCount}`);
+    lines.push(`  Orphaned:   ${summary.orphanedResourceCount}`);
+    lines.push(`  Missing:    ${summary.missingResourceCount}`);
+    lines.push('');
+
+    lines.push('Issues:');
+    lines.push(`  Total:      ${summary.issueCount}`);
+    lines.push(`  Critical:   ${summary.criticalIssueCount}`);
+    lines.push(`  Warnings:   ${summary.warningCount}`);
+    lines.push('');
+
+    // Issues Detail
+    if (report.issues.length > 0) {
+        lines.push('─'.repeat(80));
+        lines.push('Issue Details:');
+        lines.push('');
+
+        // Group issues by type
+        const criticalIssues = report.getCriticalIssues();
+        const warnings = report.getWarnings();
+
+        if (criticalIssues.length > 0) {
+            lines.push('  CRITICAL ISSUES:');
+            criticalIssues.forEach((issue, idx) => {
+                lines.push(`    ${idx + 1}. [${issue.type}] ${issue.description}`);
+                lines.push(`       Resource: ${issue.resourceType} (${issue.resourceId})`);
+                if (issue.resolution) {
+                    lines.push(`       Fix: ${issue.resolution}`);
+                }
+                lines.push('');
+            });
+        }
+
+        if (warnings.length > 0) {
+            lines.push('  WARNINGS:');
+            warnings.forEach((issue, idx) => {
+                lines.push(`    ${idx + 1}. [${issue.type}] ${issue.description}`);
+                lines.push(`       Resource: ${issue.resourceType} (${issue.resourceId})`);
+                if (issue.resolution) {
+                    lines.push(`       Fix: ${issue.resolution}`);
+                }
+                lines.push('');
+            });
+        }
+    } else {
+        lines.push('─'.repeat(80));
+        lines.push('✓ No issues detected - stack is healthy!');
+        lines.push('');
+    }
+
+    // Recommendations
+    if (report.issues.length > 0) {
+        lines.push('─'.repeat(80));
+        lines.push('Recommended Actions:');
+        lines.push('');
+
+        if (report.getOrphanedResourceCount() > 0) {
+            lines.push(`  • Import ${report.getOrphanedResourceCount()} orphaned resource(s):`);
+            lines.push(`    $ frigg repair --import <stack-name>`);
+            lines.push('');
+        }
+
+        if (report.getDriftedResourceCount() > 0) {
+            lines.push(`  • Reconcile property drift for ${report.getDriftedResourceCount()} resource(s):`);
+            lines.push(`    $ frigg repair --reconcile <stack-name>`);
+            lines.push('');
+        }
+
+        if (report.getMissingResourceCount() > 0) {
+            lines.push(`  • Investigate ${report.getMissingResourceCount()} missing resource(s) and redeploy:`);
+            lines.push(`    $ frigg deploy --stage <stage>`);
+            lines.push('');
+        }
+    }
+
+    lines.push('═'.repeat(80));
+    lines.push('');
+
+    return lines.join('\n');
+}
+
+/**
+ * Format health report as JSON
+ * @param {StackHealthReport} report - Health check report
+ * @returns {string} JSON output
+ */
+function formatJsonOutput(report) {
+    return JSON.stringify(report.toJSON(), null, 2);
+}
+
+/**
+ * Write output to file
+ * @param {string} content - Content to write
+ * @param {string} filePath - Output file path
+ */
+function writeOutputFile(content, filePath) {
+    try {
+        fs.writeFileSync(filePath, content, 'utf8');
+        console.log(`\n✓ Report saved to: ${filePath}`);
+    } catch (error) {
+        console.error(`\n✗ Failed to write output file: ${error.message}`);
+        process.exit(1);
+    }
+}
+
+/**
+ * Execute health check
+ * @param {string} stackName - CloudFormation stack name
+ * @param {Object} options - Command options
+ */
+async function doctorCommand(stackName, options = {}) {
+    try {
+        // Validate required parameter
+        if (!stackName) {
+            console.error('Error: Stack name is required');
+            console.log('Usage: frigg doctor <stack-name> [options]');
+            process.exit(1);
+        }
+
+        // Extract options with defaults
+        const region = options.region || process.env.AWS_REGION || 'us-east-1';
+        const format = options.format || 'console';
+        const verbose = options.verbose || false;
+
+        if (verbose) {
+            console.log(`\n🔍 Running health check on stack: ${stackName} (${region})`);
+        }
+
+        // 1. Create stack identifier
+        const stackIdentifier = new StackIdentifier({ stackName, region });
+
+        // 2. Wire up infrastructure layer (AWS adapters)
+        const stackRepository = new AWSStackRepository({ region });
+        const resourceDetector = new AWSResourceDetector({ region });
+
+        // 3. Wire up domain services
+        const mismatchAnalyzer = new MismatchAnalyzer();
+        const healthScoreCalculator = new HealthScoreCalculator();
+
+        // 4. Create and execute use case
+        const runHealthCheckUseCase = new RunHealthCheckUseCase({
+            stackRepository,
+            resourceDetector,
+            mismatchAnalyzer,
+            healthScoreCalculator,
+        });
+
+        const report = await runHealthCheckUseCase.execute({ stackIdentifier });
+
+        // 5. Format and output results
+        if (format === 'json') {
+            const jsonOutput = formatJsonOutput(report);
+
+            if (options.output) {
+                writeOutputFile(jsonOutput, options.output);
+            } else {
+                console.log(jsonOutput);
+            }
+        } else {
+            const consoleOutput = formatConsoleOutput(report, options);
+            console.log(consoleOutput);
+
+            if (options.output) {
+                writeOutputFile(consoleOutput, options.output);
+            }
+        }
+
+        // 6. Exit with appropriate code
+        // Exit code 0 = healthy, 1 = unhealthy, 2 = degraded
+        if (report.healthScore.isUnhealthy()) {
+            process.exit(1);
+        } else if (report.healthScore.isDegraded()) {
+            process.exit(2);
+        } else {
+            process.exit(0);
+        }
+    } catch (error) {
+        console.error(`\n✗ Health check failed: ${error.message}`);
+
+        if (options.verbose && error.stack) {
+            console.error(`\nStack trace:\n${error.stack}`);
+        }
+
+        process.exit(1);
+    }
+}
+
+module.exports = { doctorCommand };

package/frigg-cli/index.js

@@ -9,6 +9,8 @@ const { deployCommand } = require('./deploy-command');
 const { generateIamCommand } = require('./generate-iam-command');
 const { uiCommand } = require('./ui-command');
 const { dbSetupCommand } = require('./db-setup-command');
+const { doctorCommand } = require('./doctor-command');
+const { repairCommand } = require('./repair-command');
 
 const program = new Command();
 
@@ -46,6 +48,7 @@ program
     .option('-s, --stage <stage>', 'deployment stage', 'dev')
     .option('-v, --verbose', 'enable verbose output')
     .option('-f, --force', 'force deployment (bypasses caching for layers and functions)')
+    .option('--skip-doctor', 'skip post-deployment health check')
     .action(deployCommand);
 
 program
@@ -71,6 +74,26 @@ program
     .option('-v, --verbose', 'enable verbose output')
     .action(dbSetupCommand);
 
+program
+    .command('doctor <stackName>')
+    .description('Run health check on deployed CloudFormation stack')
+    .option('-r, --region <region>', 'AWS region (defaults to AWS_REGION env var or us-east-1)')
+    .option('-f, --format <format>', 'output format (console or json)', 'console')
+    .option('-o, --output <path>', 'save report to file')
+    .option('-v, --verbose', 'enable verbose output')
+    .action(doctorCommand);
+
+program
+    .command('repair <stackName>')
+    .description('Repair infrastructure issues (import orphaned resources, reconcile property drift)')
+    .option('-r, --region <region>', 'AWS region (defaults to AWS_REGION env var or us-east-1)')
+    .option('--import', 'import orphaned resources into stack')
+    .option('--reconcile', 'reconcile property drift')
+    .option('--mode <mode>', 'reconciliation mode (template or resource)', 'template')
+    .option('-y, --yes', 'skip confirmation prompts')
+    .option('-v, --verbose', 'enable verbose output')
+    .action(repairCommand);
+
 program.parse(process.argv);
 
-module.exports = { initCommand, installCommand, startCommand, buildCommand, deployCommand, generateIamCommand, uiCommand, dbSetupCommand };
+module.exports = { initCommand, installCommand, startCommand, buildCommand, deployCommand, generateIamCommand, uiCommand, dbSetupCommand, doctorCommand, repairCommand };