@devramps/cli 0.1.4 → 0.1.5

package/dist/index.js

@@ -75,6 +75,9 @@ var CloudFormationError = class extends DevRampsError {
 import chalk from "chalk";
 var verboseMode = false;
 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 = [];
@@ -96,7 +99,11 @@ var MultiStackProgress = class {
    * Register a stack to track
    */
   addStack(stackName, accountId, region, totalResources) {
-    this.stacks.set(stackName, {
+    const key = getStackKey(stackName, accountId, region);
+    if (this.stacks.has(key)) {
+      return;
+    }
+    this.stacks.set(key, {
       stackName,
       accountId,
       region,
@@ -104,14 +111,15 @@ var MultiStackProgress = class {
       total: totalResources,
       status: "pending"
     });
-    this.stackOrder.push(stackName);
+    this.stackOrder.push(key);
     this.render();
   }
   /**
    * Update a stack's progress
    */
-  updateStack(stackName, completed, status, latestEvent, latestResourceId) {
-    const stack = this.stacks.get(stackName);
+  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;
@@ -123,8 +131,9 @@ var MultiStackProgress = class {
   /**
    * Mark a stack as started
    */
-  startStack(stackName) {
-    const stack = this.stacks.get(stackName);
+  startStack(stackName, accountId, region) {
+    const key = getStackKey(stackName, accountId, region);
+    const stack = this.stacks.get(key);
     if (stack) {
       stack.status = "in_progress";
       this.render();
@@ -133,8 +142,9 @@ var MultiStackProgress = class {
   /**
    * Mark a stack as complete
    */
-  completeStack(stackName, success2) {
-    const stack = this.stacks.get(stackName);
+  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;
@@ -166,8 +176,8 @@ var MultiStackProgress = class {
    * Render final state (no clearing, just print)
    */
   renderFinal() {
-    for (const stackName of this.stackOrder) {
-      const stack = this.stacks.get(stackName);
+    for (const key of this.stackOrder) {
+      const stack = this.stacks.get(key);
       if (!stack) continue;
       console.log(this.formatStackLine(stack, false));
     }
@@ -201,37 +211,45 @@ var MultiStackProgress = class {
     const filled = Math.round(this.barWidth * percentage);
     const empty = this.barWidth - filled;
     const bar = "\u2588".repeat(filled) + "\u2591".repeat(empty);
-    const accountLabel = `[${accountId} - ${region}]`;
+    const shortAccount = accountId.slice(-4);
+    const accountLabel = `[...${shortAccount}/${region}]`;
     const countLabel = `(${completed}/${total})`;
     let eventLabel = "";
-    if (latestEvent && latestResourceId) {
-      const maxEventLen = 30;
-      const resourceIdTrunc = latestResourceId.length > 20 ? latestResourceId.slice(0, 17) + "..." : latestResourceId;
-      eventLabel = ` ${latestEvent} ${resourceIdTrunc}`;
-      if (eventLabel.length > maxEventLen) {
-        eventLabel = eventLabel.slice(0, maxEventLen - 3) + "...";
-      }
-    }
-    const line = `${statusIndicator} ${accountLabel} ${stackName} [${bar}] ${countLabel}${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 all stack progress bars
    */
   render() {
-    if (!this.isTTY) return;
-    this.clear();
-    const lines = [];
-    for (const stackName of this.stackOrder) {
-      const stack = this.stacks.get(stackName);
-      if (!stack) continue;
-      lines.push(this.formatStackLine(stack, true));
-    }
-    for (const line of lines) {
-      process.stdout.write(line + "\n");
+    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;
     }
-    this.lastLineCount = lines.length;
   }
+  isRendering = false;
 };
 var globalProgress = null;
 function getMultiStackProgress() {
@@ -409,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) {
@@ -552,14 +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) {
+async function waitForStackWithProgress(client, stackName, accountId, region, operationStartTime, totalResources, maxWaitTime = 600) {
   const seenEventIds = /* @__PURE__ */ new Set();
   const completedResources = /* @__PURE__ */ new Set();
   const startTime = Date.now();
-  const pollInterval = 3e3;
+  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) {
@@ -572,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 })
       );
@@ -589,22 +612,23 @@ async function waitForStackWithProgress(client, stackName, operationStartTime, t
         if (logicalId && logicalId !== stackName) {
           latestEvent = status;
           latestResourceId = logicalId;
+          verbose(`[${stackName}] Resource ${logicalId}: ${status}`);
           if (isResourceComplete(status)) {
             completedResources.add(logicalId);
           }
         }
       }
-      const currentStatus = stack.StackStatus || "";
       let displayStatus = "in_progress";
       if (currentStatus.includes("ROLLBACK")) {
         displayStatus = "rollback";
       } else if (currentStatus.includes("FAILED")) {
         displayStatus = "failed";
       }
-      progress.updateStack(stackName, completedResources.size, displayStatus, latestEvent, latestResourceId);
+      progress.updateStack(stackName, accountId, region, completedResources.size, displayStatus, latestEvent, latestResourceId);
       if (TERMINAL_STATES.has(currentStatus)) {
         const success2 = SUCCESS_STATES.has(currentStatus);
-        progress.completeStack(stackName, success2);
+        progress.completeStack(stackName, accountId, region, success2);
+        verbose(`[${stackName}] Reached terminal state: ${currentStatus} (success: ${success2})`);
         if (success2) {
           return;
         }
@@ -613,12 +637,12 @@ async function waitForStackWithProgress(client, stackName, operationStartTime, t
       await new Promise((resolve) => setTimeout(resolve, pollInterval));
     }
   } catch (error2) {
-    progress.completeStack(stackName, false);
+    progress.completeStack(stackName, accountId, region, false);
     throw error2;
   }
 }
 async function deployStack(options) {
-  const { stackName, template, accountId, region, credentials } = options;
+  const { stackName, template, accountId, region = "us-east-1", credentials } = options;
   const client = new CloudFormationClient({
     credentials,
     region
@@ -626,28 +650,44 @@ async function deployStack(options) {
   const templateBody = JSON.stringify(template);
   const resourceCount = Object.keys(template.Resources || {}).length;
   const progress = getMultiStackProgress();
-  progress.startStack(stackName);
+  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);
+      await updateStack(client, stackName, accountId, region, templateBody, resourceCount);
     } else {
       verbose(`Stack ${stackName} does not exist, creating...`);
-      await createStack(client, stackName, templateBody, accountId, resourceCount);
+      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, true);
+      progress.completeStack(stackName, accountId, region, true);
       return;
     }
-    progress.completeStack(stackName, false);
+    progress.completeStack(stackName, accountId, region, false);
     throw new CloudFormationError(stackName, accountId, errorMessage);
   }
 }
-async function createStack(client, stackName, templateBody, _accountId, resourceCount) {
+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({
@@ -660,9 +700,9 @@ async function createStack(client, stackName, templateBody, _accountId, resource
       ]
     })
   );
-  await waitForStackWithProgress(client, stackName, operationStartTime, resourceCount);
+  await waitForStackWithProgress(client, stackName, accountId, region, operationStartTime, resourceCount);
 }
-async function updateStack(client, stackName, templateBody, _accountId, resourceCount) {
+async function updateStack(client, stackName, accountId, region, templateBody, resourceCount) {
   const operationStartTime = /* @__PURE__ */ new Date();
   await client.send(
     new UpdateStackCommand({
@@ -671,7 +711,7 @@ async function updateStack(client, stackName, templateBody, _accountId, resource
       Capabilities: ["CAPABILITY_NAMED_IAM"]
     })
   );
-  await waitForStackWithProgress(client, stackName, operationStartTime, resourceCount);
+  await waitForStackWithProgress(client, stackName, accountId, region, operationStartTime, resourceCount);
 }
 async function readExistingStack(stackName, accountId, region, credentials) {
   const client = new CloudFormationClient({

package/package.json

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