@devramps/cli 0.1.7 → 0.1.9

package/dist/index.js

@@ -90,6 +90,8 @@ var MultiStackProgress = class {
   hasRenderedOnce = false;
   useAltScreen = true;
   // Use alternate screen buffer for clean display
+  maxStackNameLen = 40;
+  // Will be calculated dynamically
   constructor() {
     this.isTTY = process.stdout.isTTY ?? false;
   }
@@ -97,6 +99,11 @@ var MultiStackProgress = class {
    * Start the progress display (call after all stacks are registered)
    */
   start() {
+    this.maxStackNameLen = Math.max(
+      ...Array.from(this.stacks.values()).map((s) => s.stackName.length),
+      20
+      // minimum width
+    );
     if (this.isTTY) {
       if (this.useAltScreen) {
         process.stdout.write("\x1B[?1049h");
@@ -114,13 +121,14 @@ var MultiStackProgress = class {
   /**
    * Register a stack to track
    */
-  addStack(stackName, accountId, region, totalResources) {
+  addStack(stackName, stackType, accountId, region, totalResources) {
     const key = getStackKey(stackName, accountId, region);
     if (this.stacks.has(key)) {
       return;
     }
     this.stacks.set(key, {
       stackName,
+      stackType,
       accountId,
       region,
       completed: 0,
@@ -212,11 +220,26 @@ var MultiStackProgress = class {
       console.log(this.formatStackLine(stack, false));
     }
   }
+  /**
+   * Get a short label for stack type
+   */
+  getTypeLabel(stackType) {
+    switch (stackType) {
+      case "org":
+        return "ORG";
+      case "pipeline":
+        return "PIPE";
+      case "account":
+        return "ACCT";
+      case "stage":
+        return "STAGE";
+    }
+  }
   /**
    * Format a single stack line
    */
   formatStackLine(stack, withSpinner) {
-    const { accountId, region, stackName, completed, total, status, cfnStatus, latestResourceId, failureReason } = stack;
+    const { accountId, region, stackName, stackType, completed, total, status, cfnStatus, latestResourceId, failureReason } = stack;
     let statusIndicator;
     let colorFn;
     switch (status) {
@@ -241,22 +264,28 @@ 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 typeLabel = this.getTypeLabel(stackType).padEnd(5);
+    const accountLabel = `${accountId} ${region.padEnd(12)}`;
     const countLabel = `${completed}/${total}`;
-    const maxStackNameLen = 35;
-    const displayName = stackName.length > maxStackNameLen ? stackName.slice(0, maxStackNameLen - 3) + "..." : stackName.padEnd(maxStackNameLen);
+    const displayName = stackName.padEnd(this.maxStackNameLen);
     let rightInfo = "";
-    if (status === "failed" && failureReason) {
-      const maxLen = 40;
-      rightInfo = failureReason.length > maxLen ? failureReason.slice(0, maxLen - 3) + "..." : failureReason;
+    if (status === "failed" || status === "rollback") {
+      const statusText = cfnStatus || "FAILED";
+      if (failureReason && failureReason !== cfnStatus) {
+        const maxLen = 50;
+        const fullReason = `${statusText}: ${failureReason}`;
+        rightInfo = fullReason.length > maxLen ? fullReason.slice(0, maxLen - 3) + "..." : fullReason;
+      } else {
+        rightInfo = statusText;
+      }
     } else if (status === "in_progress") {
       const cfnStatusDisplay = cfnStatus || "DEPLOYING";
-      const resourceDisplay = latestResourceId ? latestResourceId.length > 20 ? latestResourceId.slice(0, 17) + "..." : latestResourceId : "";
+      const resourceDisplay = latestResourceId ? latestResourceId.length > 25 ? latestResourceId.slice(0, 22) + "..." : latestResourceId : "";
       rightInfo = resourceDisplay ? `${cfnStatusDisplay} \u2192 ${resourceDisplay}` : cfnStatusDisplay;
     } else if (status === "complete") {
-      rightInfo = "COMPLETE";
+      rightInfo = cfnStatus || "COMPLETE";
     }
-    const leftPart = `${statusIndicator} ${accountLabel} ${displayName}`;
+    const leftPart = `${statusIndicator} [${typeLabel}] ${accountLabel} ${displayName}`;
     const middlePart = `[${bar}] ${countLabel}`;
     const line = `${leftPart} ${middlePart} ${rightInfo}`;
     return colorFn(line);
@@ -611,6 +640,7 @@ async function waitForStackWithProgress(client, stackName, accountId, region, op
   const pollInterval = 2e3;
   const progress = getMultiStackProgress();
   let latestResourceId = "";
+  let latestFailureReason = "";
   verbose(`[${stackName}] Starting to wait for stack operation...`);
   try {
     while (true) {
@@ -646,6 +676,10 @@ async function waitForStackWithProgress(client, stackName, accountId, region, op
           if (isResourceComplete(status)) {
             completedResources.add(logicalId);
           }
+          if (status.includes("FAILED") && event.ResourceStatusReason) {
+            latestFailureReason = `${logicalId}: ${event.ResourceStatusReason}`;
+            verbose(`[${stackName}] Failure reason: ${latestFailureReason}`);
+          }
         }
       }
       let displayStatus = "in_progress";
@@ -657,7 +691,7 @@ async function waitForStackWithProgress(client, stackName, accountId, region, op
       progress.updateStack(stackName, accountId, region, completedResources.size, displayStatus, currentStatus, latestResourceId);
       if (TERMINAL_STATES.has(currentStatus)) {
         const success2 = SUCCESS_STATES.has(currentStatus);
-        const failureReason = success2 ? void 0 : currentStatus;
+        const failureReason = success2 ? void 0 : latestFailureReason || currentStatus;
         progress.completeStack(stackName, accountId, region, success2, failureReason);
         verbose(`[${stackName}] Reached terminal state: ${currentStatus} (success: ${success2})`);
         if (success2) {
@@ -1486,18 +1520,6 @@ function addOidcProviderResource(template, conditional = true) {
     }
   };
 }
-function getOidcProviderArn(accountId, conditional = true) {
-  if (conditional) {
-    return {
-      "Fn::If": [
-        "CreateOIDCProvider",
-        { "Fn::GetAtt": ["DevRampsOIDCProvider", "Arn"] },
-        `arn:aws:iam::${accountId}:oidc-provider/${OIDC_PROVIDER_URL}`
-      ]
-    };
-  }
-  return { "Fn::GetAtt": ["DevRampsOIDCProvider", "Arn"] };
-}
 function buildOidcTrustPolicy(accountId, subject) {
   return {
     Version: "2012-10-17",
@@ -1875,7 +1897,6 @@ function createTerraformStateBucketPolicy(bucketName, cicdAccountId, allowedAcco
 function generateOrgStackTemplate(options) {
   const { orgSlug, cicdAccountId, targetAccountIds } = options;
   const template = createBaseTemplate(`DevRamps Org Stack for ${orgSlug}`);
-  addOidcProviderResource(template, true);
   const kmsKeyPolicy = buildKmsKeyPolicy(cicdAccountId, targetAccountIds);
   template.Resources.DevRampsKMSKey = createKmsKeyResource(
     `DevRamps encryption key for org: ${orgSlug}`,
@@ -1939,10 +1960,6 @@ function generateOrgStackTemplate(options) {
     TerraformStateBucketArn: {
       Description: "ARN of the Terraform state bucket",
       Value: { "Fn::GetAtt": ["TerraformStateBucket", "Arn"] }
-    },
-    OIDCProviderArn: {
-      Description: "ARN of the OIDC provider",
-      Value: getOidcProviderArn(cicdAccountId, true)
     }
   };
   return template;
@@ -2622,6 +2639,14 @@ async function buildDeploymentPlan(pipelines, pipelineArtifacts, authData, curre
   const accountStacks = [];
   const accountStackName = getAccountStackName();
   const accountsWithStacks = /* @__PURE__ */ new Set();
+  accountsWithStacks.add(cicdAccountId);
+  accountStacks.push({
+    stackType: "Account" /* ACCOUNT */,
+    stackName: accountStackName,
+    accountId: cicdAccountId,
+    region: cicdRegion,
+    action: await determineStackAction(accountStackName, cicdCredentials, cicdRegion)
+  });
   for (const pipeline of pipelines) {
     for (const stage of pipeline.stages) {
       if (accountsWithStacks.has(stage.account_id)) {
@@ -2770,17 +2795,17 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
   info(`Deploying ${totalStacks} stack(s) in parallel...`);
   newline();
   const progress = getMultiStackProgress();
-  progress.addStack(plan.orgStack.stackName, plan.orgStack.accountId, plan.orgStack.region, 5);
+  progress.addStack(plan.orgStack.stackName, "org", 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));
+    progress.addStack(stack.stackName, "pipeline", stack.accountId, stack.region, Math.max(resourceCount, 1));
   }
   for (const stack of plan.accountStacks) {
-    progress.addStack(stack.stackName, stack.accountId, stack.region, 1);
+    progress.addStack(stack.stackName, "account", 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);
+    progress.addStack(stack.stackName, "stage", stack.accountId, stack.region, resourceCount);
   }
   progress.start();
   const orgPromise = (async () => {

package/package.json

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