Await promises separate from queueing

aws · Jul 4, 2022 · 23f2f70 · 23f2f70
1 parent 9624bf7
commit 23f2f70
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/packages/aws-cdk/lib/cdk-toolkit.ts b/packages/aws-cdk/lib/cdk-toolkit.ts
@@ -299,23 +299,31 @@ export class CdkToolkit {
         .filter((id) => !id.endsWith('.assets'))
         .every((id) => !stacksAwaitingDeploy[id]);
 
+    const stackDeployPromises: Promise<void>[] = [];
+
     const enqueueStackDeploys = async () => {
-      await Promise.all(stacks.map(async (stack) => {
+      stacks.forEach(async (stack) => {
         if (isStackUnblocked(stack)) {
           // Find current index due to stacks list changing within loop
           const index = stacks.indexOf(stack);
           stacks.splice(index, 1);
 
-          return queue.add(async () => {
+          stackDeployPromises.push(queue.add(async () => {
             await deployStack(stack);
             await enqueueStackDeploys();
-          });
+          }));
         }
-      }));
+      });
     };
 
-    await enqueueStackDeploys();
-    await queue.onIdle();
+    try {
+      await enqueueStackDeploys();
+      await Promise.all(stackDeployPromises);
+      await queue.onIdle();
+    } catch (e) {
+      error('\n ❌ Deployment failed: %s', e);
+      throw e;
+    }
   }
 
   public async watch(options: WatchOptions) {