@devramps/cli 0.1.3 → 0.1.5

package/dist/index.js

@@ -74,54 +74,85 @@ var CloudFormationError = class extends DevRampsError {
 // src/utils/logger.ts
 import chalk from "chalk";
 var verboseMode = false;
-var ProgressBar = class {
-  completed = 0;
-  total = 0;
-  label;
-  barWidth = 30;
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function getStackKey(stackName, accountId, region) {
+  return `${stackName}:${accountId}:${region}`;
+}
+var MultiStackProgress = class {
+  stacks = /* @__PURE__ */ new Map();
+  stackOrder = [];
   lastLineCount = 0;
-  inProgressResources = /* @__PURE__ */ new Map();
   isTTY;
-  constructor(label, total) {
-    this.label = label;
-    this.total = total;
+  spinnerFrame = 0;
+  spinnerInterval = null;
+  barWidth = 20;
+  constructor() {
     this.isTTY = process.stdout.isTTY ?? false;
-    this.render();
+    if (this.isTTY) {
+      this.spinnerInterval = setInterval(() => {
+        this.spinnerFrame = (this.spinnerFrame + 1) % SPINNER_FRAMES.length;
+        this.render();
+      }, 80);
+    }
   }
   /**
-   * Update progress with resource status
+   * Register a stack to track
    */
-  update(completed, resourceStatus) {
-    this.completed = completed;
-    if (resourceStatus) {
-      if (resourceStatus.status === "in_progress") {
-        this.inProgressResources.set(resourceStatus.logicalId, resourceStatus);
-      } else {
-        this.inProgressResources.delete(resourceStatus.logicalId);
-      }
+  addStack(stackName, accountId, region, totalResources) {
+    const key = getStackKey(stackName, accountId, region);
+    if (this.stacks.has(key)) {
+      return;
     }
+    this.stacks.set(key, {
+      stackName,
+      accountId,
+      region,
+      completed: 0,
+      total: totalResources,
+      status: "pending"
+    });
+    this.stackOrder.push(key);
     this.render();
   }
   /**
-   * Set a resource as in-progress
+   * Update a stack's progress
    */
-  setInProgress(logicalId, resourceType) {
-    this.inProgressResources.set(logicalId, {
-      logicalId,
-      resourceType,
-      status: "in_progress"
-    });
-    this.render();
+  updateStack(stackName, accountId, region, completed, status, latestEvent, latestResourceId) {
+    const key = getStackKey(stackName, accountId, region);
+    const stack = this.stacks.get(key);
+    if (stack) {
+      stack.completed = completed;
+      stack.status = status;
+      if (latestEvent) stack.latestEvent = latestEvent;
+      if (latestResourceId) stack.latestResourceId = latestResourceId;
+      this.render();
+    }
   }
   /**
-   * Mark a resource as complete (removes from in-progress)
+   * Mark a stack as started
    */
-  setComplete(logicalId) {
-    this.inProgressResources.delete(logicalId);
-    this.render();
+  startStack(stackName, accountId, region) {
+    const key = getStackKey(stackName, accountId, region);
+    const stack = this.stacks.get(key);
+    if (stack) {
+      stack.status = "in_progress";
+      this.render();
+    }
+  }
+  /**
+   * Mark a stack as complete
+   */
+  completeStack(stackName, accountId, region, success2) {
+    const key = getStackKey(stackName, accountId, region);
+    const stack = this.stacks.get(key);
+    if (stack) {
+      stack.status = success2 ? "complete" : "failed";
+      stack.completed = success2 ? stack.total : stack.completed;
+      this.render();
+    }
   }
   /**
-   * Clear the progress bar from the terminal (only for TTY)
+   * Clear the display
    */
   clear() {
     if (!this.isTTY) return;
@@ -131,56 +162,108 @@ var ProgressBar = class {
     this.lastLineCount = 0;
   }
   /**
-   * Finish the progress bar (don't clear - leave final state visible)
+   * Finish and stop updates
    */
   finish() {
+    if (this.spinnerInterval) {
+      clearInterval(this.spinnerInterval);
+      this.spinnerInterval = null;
+    }
     this.clear();
-    this.inProgressResources.clear();
-    const percentage = this.total > 0 ? this.completed / this.total : 0;
+    this.renderFinal();
+  }
+  /**
+   * Render final state (no clearing, just print)
+   */
+  renderFinal() {
+    for (const key of this.stackOrder) {
+      const stack = this.stacks.get(key);
+      if (!stack) continue;
+      console.log(this.formatStackLine(stack, false));
+    }
+  }
+  /**
+   * Format a single stack line
+   */
+  formatStackLine(stack, withSpinner) {
+    const { accountId, region, stackName, completed, total, status, latestEvent, latestResourceId } = stack;
+    let statusIndicator;
+    let colorFn;
+    switch (status) {
+      case "complete":
+        statusIndicator = "\u2714";
+        colorFn = chalk.green;
+        break;
+      case "failed":
+      case "rollback":
+        statusIndicator = "\u2716";
+        colorFn = chalk.red;
+        break;
+      case "in_progress":
+        statusIndicator = withSpinner ? SPINNER_FRAMES[this.spinnerFrame] : "\u22EF";
+        colorFn = chalk.blue;
+        break;
+      default:
+        statusIndicator = "\u25CB";
+        colorFn = chalk.gray;
+    }
+    const percentage = total > 0 ? completed / total : 0;
     const filled = Math.round(this.barWidth * percentage);
     const empty = this.barWidth - filled;
-    const bar = chalk.green("\u2588".repeat(filled)) + chalk.gray("\u2591".repeat(empty));
-    const count = chalk.cyan(`${this.completed}/${this.total}`);
-    const labelText = chalk.bold(this.label);
-    console.log(`${labelText} ${bar} ${count} resources`);
+    const bar = "\u2588".repeat(filled) + "\u2591".repeat(empty);
+    const shortAccount = accountId.slice(-4);
+    const accountLabel = `[...${shortAccount}/${region}]`;
+    const countLabel = `(${completed}/${total})`;
+    let eventLabel = "";
+    if (status === "in_progress" && latestEvent && latestResourceId) {
+      const shortStatus = latestEvent.replace("CREATE_", "").replace("UPDATE_", "").replace("DELETE_", "");
+      const resourceIdTrunc = latestResourceId.length > 15 ? latestResourceId.slice(0, 12) + "..." : latestResourceId;
+      eventLabel = ` ${shortStatus} ${resourceIdTrunc}`;
+    }
+    const maxStackNameLen = 40;
+    const displayName = stackName.length > maxStackNameLen ? "..." + stackName.slice(-(maxStackNameLen - 3)) : stackName;
+    const line = `${statusIndicator} ${accountLabel} ${displayName} [${bar}] ${countLabel}${eventLabel}`;
+    return colorFn(line);
   }
   /**
-   * Render the progress bar with in-progress resources
+   * Render all stack progress bars
    */
   render() {
-    this.clear();
-    const lines = [];
-    const percentage = this.total > 0 ? this.completed / this.total : 0;
-    const filled = Math.round(this.barWidth * percentage);
-    const empty = this.barWidth - filled;
-    const bar = chalk.green("\u2588".repeat(filled)) + chalk.gray("\u2591".repeat(empty));
-    const count = chalk.cyan(`${this.completed}/${this.total}`);
-    const labelText = chalk.bold(this.label);
-    lines.push(`${labelText} ${bar} ${count} resources`);
-    const inProgress = Array.from(this.inProgressResources.values()).slice(0, 8);
-    if (inProgress.length > 0) {
-      for (const resource of inProgress) {
-        const spinner = chalk.yellow("\u22EF");
-        const type = chalk.gray(resource.resourceType);
-        lines.push(`  ${spinner} ${resource.logicalId} ${type}`);
-      }
-      const remaining = this.inProgressResources.size - inProgress.length;
-      if (remaining > 0) {
-        lines.push(chalk.gray(`  ... and ${remaining} more in progress`));
-      }
-    }
-    if (this.isTTY) {
-      for (const line of lines) {
-        process.stdout.write(line + "\n");
-      }
-      this.lastLineCount = lines.length;
-    } else {
-      if (this.completed === 0 || this.completed === this.total) {
-        console.log(lines[0]);
+    if (this.isRendering) return;
+    this.isRendering = true;
+    try {
+      if (this.isTTY) {
+        this.clear();
+        const lines = [];
+        for (const key of this.stackOrder) {
+          const stack = this.stacks.get(key);
+          if (!stack) continue;
+          lines.push(this.formatStackLine(stack, true));
+        }
+        for (const line of lines) {
+          process.stdout.write(line + "\n");
+        }
+        this.lastLineCount = lines.length;
       }
+    } finally {
+      this.isRendering = false;
     }
   }
+  isRendering = false;
 };
+var globalProgress = null;
+function getMultiStackProgress() {
+  if (!globalProgress) {
+    globalProgress = new MultiStackProgress();
+  }
+  return globalProgress;
+}
+function clearMultiStackProgress() {
+  if (globalProgress) {
+    globalProgress.finish();
+    globalProgress = null;
+  }
+}
 function setVerbose(enabled) {
   verboseMode = enabled;
 }
@@ -241,18 +324,6 @@ function table(rows) {
 function newline() {
   console.log();
 }
-function resourceProgress(stackName, resourceId, resourceType, status, reason) {
-  const stackLabel = chalk.cyan(`[${stackName}]`);
-  const typeLabel = chalk.gray(resourceType);
-  if (status === "in_progress") {
-    console.log(`${stackLabel} ${chalk.yellow("\u22EF")} ${resourceId} ${typeLabel}`);
-  } else if (status === "complete") {
-    console.log(`${stackLabel} ${chalk.green("\u2714")} ${resourceId} ${typeLabel}`);
-  } else if (status === "failed") {
-    const reasonText = reason ? ` - ${reason}` : "";
-    console.log(`${stackLabel} ${chalk.red("\u2716")} ${resourceId} ${typeLabel}${reasonText}`);
-  }
-}
 
 // src/aws/credentials.ts
 var DEFAULT_REGION = "us-east-1";
@@ -356,10 +427,12 @@ import {
   DescribeStackEventsCommand,
   CreateStackCommand,
   UpdateStackCommand,
+  DeleteStackCommand,
   CreateChangeSetCommand,
   DescribeChangeSetCommand,
   DeleteChangeSetCommand,
   waitUntilChangeSetCreateComplete,
+  waitUntilStackDeleteComplete,
   ChangeSetType
 } from "@aws-sdk/client-cloudformation";
 async function getStackStatus(stackName, credentials, region) {
@@ -499,13 +572,15 @@ function isResourceComplete(status) {
   if (!status) return false;
   return status.includes("_COMPLETE") && !status.includes("ROLLBACK");
 }
-async function waitForStackWithProgress(client, stackName, operationStartTime, totalResources, maxWaitTime = 600, showProgress = true) {
+async function waitForStackWithProgress(client, stackName, accountId, region, operationStartTime, totalResources, maxWaitTime = 600) {
   const seenEventIds = /* @__PURE__ */ new Set();
   const completedResources = /* @__PURE__ */ new Set();
-  const inProgressResources = /* @__PURE__ */ new Map();
   const startTime = Date.now();
-  const pollInterval = 3e3;
-  const progressBar = showProgress ? new ProgressBar(stackName, totalResources) : null;
+  const pollInterval = 2e3;
+  const progress = getMultiStackProgress();
+  let latestEvent = "";
+  let latestResourceId = "";
+  verbose(`[${stackName}] Starting to wait for stack operation...`);
   try {
     while (true) {
       if (Date.now() - startTime > maxWaitTime * 1e3) {
@@ -518,6 +593,8 @@ async function waitForStackWithProgress(client, stackName, operationStartTime, t
       if (!stack) {
         throw new Error(`Stack ${stackName} not found`);
       }
+      const currentStatus = stack.StackStatus || "";
+      verbose(`[${stackName}] Current status: ${currentStatus}`);
       const eventsResponse = await client.send(
         new DescribeStackEventsCommand({ StackName: stackName })
       );
@@ -531,56 +608,28 @@ async function waitForStackWithProgress(client, stackName, operationStartTime, t
           seenEventIds.add(event.EventId);
         }
         const logicalId = event.LogicalResourceId;
-        const resourceType = event.ResourceType || "Unknown";
         const status = event.ResourceStatus || "";
         if (logicalId && logicalId !== stackName) {
-          if (status.includes("IN_PROGRESS")) {
-            inProgressResources.set(logicalId, { resourceType });
-            if (progressBar) {
-              const resourceStatus = {
-                logicalId,
-                resourceType,
-                status: "in_progress"
-              };
-              progressBar.update(completedResources.size, resourceStatus);
-            } else {
-              resourceProgress(stackName, logicalId, resourceType, "in_progress");
-            }
-          } else if (isResourceComplete(status)) {
+          latestEvent = status;
+          latestResourceId = logicalId;
+          verbose(`[${stackName}] Resource ${logicalId}: ${status}`);
+          if (isResourceComplete(status)) {
             completedResources.add(logicalId);
-            inProgressResources.delete(logicalId);
-            if (progressBar) {
-              const resourceStatus = {
-                logicalId,
-                resourceType,
-                status: "complete"
-              };
-              progressBar.update(completedResources.size, resourceStatus);
-            } else {
-              resourceProgress(stackName, logicalId, resourceType, "complete");
-            }
-          } else if (status.includes("FAILED") || status.includes("ROLLBACK")) {
-            inProgressResources.delete(logicalId);
-            if (progressBar) {
-              const resourceStatus = {
-                logicalId,
-                resourceType,
-                status: "failed",
-                reason: event.ResourceStatusReason
-              };
-              progressBar.update(completedResources.size, resourceStatus);
-            } else {
-              resourceProgress(stackName, logicalId, resourceType, "failed", event.ResourceStatusReason);
-            }
           }
         }
       }
-      const currentStatus = stack.StackStatus || "";
+      let displayStatus = "in_progress";
+      if (currentStatus.includes("ROLLBACK")) {
+        displayStatus = "rollback";
+      } else if (currentStatus.includes("FAILED")) {
+        displayStatus = "failed";
+      }
+      progress.updateStack(stackName, accountId, region, completedResources.size, displayStatus, latestEvent, latestResourceId);
       if (TERMINAL_STATES.has(currentStatus)) {
-        if (progressBar) {
-          progressBar.finish();
-        }
-        if (SUCCESS_STATES.has(currentStatus)) {
+        const success2 = SUCCESS_STATES.has(currentStatus);
+        progress.completeStack(stackName, accountId, region, success2);
+        verbose(`[${stackName}] Reached terminal state: ${currentStatus} (success: ${success2})`);
+        if (success2) {
           return;
         }
         throw new Error(`Stack operation failed with status: ${currentStatus}`);
@@ -588,39 +637,57 @@ async function waitForStackWithProgress(client, stackName, operationStartTime, t
       await new Promise((resolve) => setTimeout(resolve, pollInterval));
     }
   } catch (error2) {
-    if (progressBar) {
-      progressBar.finish();
-    }
+    progress.completeStack(stackName, accountId, region, false);
     throw error2;
   }
 }
 async function deployStack(options) {
-  const { stackName, template, accountId, region, credentials, showProgress = true } = options;
+  const { stackName, template, accountId, region = "us-east-1", credentials } = options;
   const client = new CloudFormationClient({
     credentials,
     region
   });
   const templateBody = JSON.stringify(template);
   const resourceCount = Object.keys(template.Resources || {}).length;
+  const progress = getMultiStackProgress();
+  progress.startStack(stackName, accountId, region);
   try {
     const stackStatus = await getStackStatus(stackName, credentials, region);
-    if (stackStatus.exists) {
+    if (stackStatus.exists && stackStatus.status === "ROLLBACK_COMPLETE") {
+      verbose(`Stack ${stackName} is in ROLLBACK_COMPLETE state, deleting before recreating...`);
+      await deleteStack(client, stackName);
+      verbose(`Stack ${stackName} deleted, now creating...`);
+      await createStack(client, stackName, accountId, region, templateBody, resourceCount);
+    } else if (stackStatus.exists) {
       verbose(`Stack ${stackName} exists, updating...`);
-      await updateStack(client, stackName, templateBody, accountId, resourceCount, showProgress);
+      await updateStack(client, stackName, accountId, region, templateBody, resourceCount);
     } else {
       verbose(`Stack ${stackName} does not exist, creating...`);
-      await createStack(client, stackName, templateBody, accountId, resourceCount, showProgress);
+      await createStack(client, stackName, accountId, region, templateBody, resourceCount);
     }
   } catch (error2) {
     const errorMessage = error2 instanceof Error ? error2.message : String(error2);
     if (errorMessage.includes("No updates are to be performed")) {
       verbose(`Stack ${stackName} is already up to date`);
+      progress.completeStack(stackName, accountId, region, true);
       return;
     }
+    progress.completeStack(stackName, accountId, region, false);
     throw new CloudFormationError(stackName, accountId, errorMessage);
   }
 }
-async function createStack(client, stackName, templateBody, accountId, resourceCount, showProgress = true) {
+async function deleteStack(client, stackName) {
+  await client.send(
+    new DeleteStackCommand({
+      StackName: stackName
+    })
+  );
+  await waitUntilStackDeleteComplete(
+    { client, maxWaitTime: 300 },
+    { StackName: stackName }
+  );
+}
+async function createStack(client, stackName, accountId, region, templateBody, resourceCount) {
   const operationStartTime = /* @__PURE__ */ new Date();
   await client.send(
     new CreateStackCommand({
@@ -633,11 +700,9 @@ async function createStack(client, stackName, templateBody, accountId, resourceC
       ]
     })
   );
-  info(`Creating stack ${stackName}...`);
-  await waitForStackWithProgress(client, stackName, operationStartTime, resourceCount, 600, showProgress);
-  success(`Stack ${stackName} created successfully in account ${accountId}`);
+  await waitForStackWithProgress(client, stackName, accountId, region, operationStartTime, resourceCount);
 }
-async function updateStack(client, stackName, templateBody, accountId, resourceCount, showProgress = true) {
+async function updateStack(client, stackName, accountId, region, templateBody, resourceCount) {
   const operationStartTime = /* @__PURE__ */ new Date();
   await client.send(
     new UpdateStackCommand({
@@ -646,9 +711,7 @@ async function updateStack(client, stackName, templateBody, accountId, resourceC
       Capabilities: ["CAPABILITY_NAMED_IAM"]
     })
   );
-  info(`Updating stack ${stackName}...`);
-  await waitForStackWithProgress(client, stackName, operationStartTime, resourceCount, 600, showProgress);
-  success(`Stack ${stackName} updated successfully in account ${accountId}`);
+  await waitForStackWithProgress(client, stackName, accountId, region, operationStartTime, resourceCount);
 }
 async function readExistingStack(stackName, accountId, region, credentials) {
   const client = new CloudFormationClient({
@@ -2675,6 +2738,19 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
   header("Deploying All Stacks");
   info(`Deploying ${totalStacks} stack(s) in parallel...`);
   newline();
+  const progress = getMultiStackProgress();
+  progress.addStack(plan.orgStack.stackName, plan.orgStack.accountId, plan.orgStack.region, 5);
+  for (const stack of plan.pipelineStacks) {
+    const resourceCount = stack.dockerArtifacts.length + stack.bundleArtifacts.length;
+    progress.addStack(stack.stackName, stack.accountId, stack.region, Math.max(resourceCount, 1));
+  }
+  for (const stack of plan.accountStacks) {
+    progress.addStack(stack.stackName, stack.accountId, stack.region, 1);
+  }
+  for (const stack of plan.stageStacks) {
+    const resourceCount = stack.dockerArtifacts.length + stack.bundleArtifacts.length + 2;
+    progress.addStack(stack.stackName, stack.accountId, stack.region, resourceCount);
+  }
   const orgPromise = (async () => {
     try {
       await deployOrgStack(plan, pipelines, authData, currentAccountId, options);
@@ -2702,10 +2778,10 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
   const accountPromises = plan.accountStacks.map(async (stack) => {
     try {
       await deployAccountStack(stack, currentAccountId, options);
-      return { stack: `${stack.stackName} (${stack.accountId})`, success: true };
+      return { stack: stack.stackName, success: true };
     } catch (error2) {
       return {
-        stack: `${stack.stackName} (${stack.accountId})`,
+        stack: stack.stackName,
         success: false,
         error: error2 instanceof Error ? error2.message : String(error2)
       };
@@ -2729,6 +2805,7 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
     ...accountPromises,
     ...stagePromises
   ]);
+  clearMultiStackProgress();
   newline();
   for (const result of allResults) {
     if (result.success) {
@@ -2784,9 +2861,7 @@ async function deployOrgStack(plan, pipelines, authData, currentAccountId, optio
     template,
     accountId: cicdAccountId,
     region: cicdRegion,
-    credentials,
-    showProgress: false
-    // Disable progress bar for parallel deployment
+    credentials
   };
   await previewStackChanges(deployOptions);
   await deployStack(deployOptions);
@@ -2809,9 +2884,7 @@ async function deployPipelineStack(stack, authData, currentAccountId, options) {
     template,
     accountId: cicdAccountId,
     region: cicdRegion,
-    credentials,
-    showProgress: false
-    // Disable progress bar for parallel deployment
+    credentials
   };
   await previewStackChanges(deployOptions);
   await deployStack(deployOptions);
@@ -2828,9 +2901,7 @@ async function deployAccountStack(stack, currentAccountId, options) {
     template,
     accountId: stack.accountId,
     region: stack.region,
-    credentials,
-    showProgress: false
-    // Disable progress bar for parallel deployment
+    credentials
   };
   await previewStackChanges(deployOptions);
   await deployStack(deployOptions);
@@ -2856,9 +2927,7 @@ async function deployStageStack(stack, authData, currentAccountId, options) {
     template,
     accountId: stack.accountId,
     region: stack.region,
-    credentials,
-    showProgress: false
-    // Disable progress bar for parallel deployment
+    credentials
   };
   await previewStackChanges(deployOptions);
   await deployStack(deployOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devramps/cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "DevRamps CLI - Bootstrap AWS infrastructure for CI/CD pipelines",
   "main": "dist/index.js",
   "bin": {