@devramps/cli 0.1.11 → 0.1.12

package/dist/index.js

@@ -933,6 +933,11 @@ async function authenticateViaBrowser(options = {}) {
   const state = generateState();
   verbose("Generated PKCE code_challenge and state");
   const { server, port, callbackPromise } = await startCallbackServer(state);
+  const sigintHandler = () => {
+    server.close();
+    process.exit(130);
+  };
+  process.on("SIGINT", sigintHandler);
   try {
     const redirectUri = `http://localhost:${port}`;
     const authParams = new URLSearchParams({
@@ -1005,6 +1010,7 @@ async function authenticateViaBrowser(options = {}) {
       cicdRegion: awsConfig.defaultRegion
     };
   } finally {
+    process.removeListener("SIGINT", sigintHandler);
     await closeServer(server);
   }
 }
@@ -1296,8 +1302,11 @@ async function parseAdditionalPolicies(pipelineDir) {
     if (!policy || typeof policy !== "object") {
       throw new Error(`Policy at index ${i} is not an object`);
     }
-    if (!("Statement" in policy) || !Array.isArray(policy.Statement)) {
-      throw new Error(`Policy at index ${i} is missing Statement array`);
+    if (!("Statement" in policy) || !policy.Statement || typeof policy.Statement !== "object") {
+      throw new Error(`Policy at index ${i} is missing Statement`);
+    }
+    if (!Array.isArray(policy.Statement)) {
+      policy.Statement = [policy.Statement];
     }
     validatedPolicies.push(policy);
   }
@@ -2771,7 +2780,9 @@ async function showDryRunPlan(plan) {
   }
   const totalStacks = 1 + plan.pipelineStacks.length + plan.accountStacks.length + plan.stageStacks.length;
   newline();
-  info(`Total stacks to deploy (in parallel): ${totalStacks}`);
+  info(`Total stacks to deploy: ${totalStacks}`);
+  info(`  Phase 1: ${plan.accountStacks.length} Account stack(s) (deployed first)`);
+  info(`  Phase 2: ${1 + plan.pipelineStacks.length + plan.stageStacks.length} Org/Pipeline/Stage stack(s) (deployed in parallel after Phase 1)`);
 }
 async function confirmDeploymentPlan(plan) {
   const totalStacks = 1 + plan.pipelineStacks.length + plan.accountStacks.length + plan.stageStacks.length;
@@ -2794,24 +2805,62 @@ async function confirmDeploymentPlan(plan) {
 async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, currentAccountId, options) {
   const results = { success: 0, failed: 0 };
   const totalStacks = 1 + plan.pipelineStacks.length + plan.accountStacks.length + plan.stageStacks.length;
+  const remainingStacks = 1 + plan.pipelineStacks.length + plan.stageStacks.length;
   newline();
-  header("Deploying All Stacks");
-  info(`Deploying ${totalStacks} stack(s) in parallel...`);
+  header("Phase 1: Deploying Account Bootstrap Stacks");
+  info(`Deploying ${plan.accountStacks.length} account stack(s) in parallel...`);
   newline();
-  const progress = getMultiStackProgress();
-  progress.addStack(plan.orgStack.stackName, "org", plan.orgStack.accountId, plan.orgStack.region, 5);
+  const accountProgress = getMultiStackProgress();
+  for (const stack of plan.accountStacks) {
+    accountProgress.addStack(stack.stackName, "account", stack.accountId, stack.region, 1);
+  }
+  accountProgress.start();
+  const accountResults = await Promise.all(
+    plan.accountStacks.map(async (stack) => {
+      try {
+        await deployAccountStack(stack, currentAccountId, options);
+        return { stack: `${stack.stackName} (${stack.accountId})`, success: true };
+      } catch (error2) {
+        return {
+          stack: `${stack.stackName} (${stack.accountId})`,
+          success: false,
+          error: error2 instanceof Error ? error2.message : String(error2)
+        };
+      }
+    })
+  );
+  clearMultiStackProgress();
+  newline();
+  for (const result of accountResults) {
+    if (result.success) {
+      success(`${result.stack} deployed`);
+      results.success++;
+    } else {
+      error(`${result.stack} failed: ${result.error}`);
+      results.failed++;
+    }
+  }
+  if (results.failed > 0) {
+    newline();
+    header("Deployment Summary");
+    error(`${results.failed} account stack(s) failed. Skipping remaining ${remainingStacks} stack(s).`);
+    process.exit(1);
+  }
+  newline();
+  header("Phase 2: Deploying Org, Pipeline, and Stage Stacks");
+  info(`Deploying ${remainingStacks} stack(s) in parallel...`);
+  newline();
+  const mainProgress = getMultiStackProgress();
+  mainProgress.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, "pipeline", stack.accountId, stack.region, Math.max(resourceCount, 1));
-  }
-  for (const stack of plan.accountStacks) {
-    progress.addStack(stack.stackName, "account", stack.accountId, stack.region, 1);
+    mainProgress.addStack(stack.stackName, "pipeline", stack.accountId, stack.region, Math.max(resourceCount, 1));
   }
   for (const stack of plan.stageStacks) {
     const resourceCount = stack.dockerArtifacts.length + stack.bundleArtifacts.length + 2;
-    progress.addStack(stack.stackName, "stage", stack.accountId, stack.region, resourceCount);
+    mainProgress.addStack(stack.stackName, "stage", stack.accountId, stack.region, resourceCount);
   }
-  progress.start();
+  mainProgress.start();
   const orgPromise = (async () => {
     try {
       await deployOrgStack(plan, pipelines, authData, currentAccountId, options);
@@ -2836,18 +2885,6 @@ 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, success: true };
-    } catch (error2) {
-      return {
-        stack: stack.stackName,
-        success: false,
-        error: error2 instanceof Error ? error2.message : String(error2)
-      };
-    }
-  });
   const stagePromises = plan.stageStacks.map(async (stack) => {
     try {
       await deployStageStack(stack, authData, currentAccountId, options);
@@ -2860,15 +2897,14 @@ async function executeDeployment(plan, pipelines, pipelineArtifacts, authData, c
       };
     }
   });
-  const allResults = await Promise.all([
+  const mainResults = await Promise.all([
     orgPromise,
     ...pipelinePromises,
-    ...accountPromises,
     ...stagePromises
   ]);
   clearMultiStackProgress();
   newline();
-  for (const result of allResults) {
+  for (const result of mainResults) {
     if (result.success) {
       success(`${result.stack} deployed`);
       results.success++;

package/package.json

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