sst 2.0.0-rc.67 → 2.0.0-rc.68

package/cli/ui/deploy.js

@@ -14,8 +14,7 @@ export const DeploymentUI = (props) => {
         const bus = useBus();
         const event = bus.subscribe("stack.event", (payload) => {
             const { event } = payload.properties;
-            if (event.ResourceType === "AWS::CloudFormation::Stack")
-                return;
+            // if (event.ResourceType === "AWS::CloudFormation::Stack") return;
             setResources((previous) => {
                 if (Stacks.isFinal(event.ResourceStatus)) {
                     const readable = logicalIdToCdkPath(props.assembly, event.StackName, event.LogicalResourceId);
@@ -23,7 +22,9 @@ export const DeploymentUI = (props) => {
                         ? Colors.dim(`${stackNameToId(event.StackName)} ${readable} ${event.ResourceType}`)
                         : Colors.dim(`${stackNameToId(event.StackName)} ${event.ResourceType}`), Stacks.isFailed(event.ResourceStatus)
                         ? Colors.danger(event.ResourceStatus)
-                        : Colors.dim(event.ResourceStatus), Stacks.isFailed(event.ResourceStatus) && event.ResourceStatusReason);
+                        : Colors.dim(event.ResourceStatus), Stacks.isFailed(event.ResourceStatus) && event.ResourceStatusReason
+                        ? event.ResourceStatusReason
+                        : "");
                     const { [event.LogicalResourceId]: _, ...next } = previous;
                     return next;
                 }
@@ -67,7 +68,7 @@ export const DeploymentUI = (props) => {
 };
 export function printDeploymentResults(assembly, results, remove) {
     // Print success stacks
-    const success = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length === 0);
+    const success = Object.entries(results).filter(([_stack, result]) => Stacks.isSuccess(result.status));
     if (success.length) {
         Colors.gap();
         Colors.line(Colors.success(`✔`), Colors.bold(remove ? `  Removed:` : ` Deployed:`));
@@ -84,12 +85,12 @@ export function printDeploymentResults(assembly, results, remove) {
         Colors.gap();
     }
     // Print failed stacks
-    const failed = Object.entries(results).filter(([_stack, result]) => Object.keys(result.errors).length > 0);
+    const failed = Object.entries(results).filter(([_stack, result]) => Stacks.isFailed(result.status));
     if (failed.length) {
         Colors.gap();
         Colors.line(`${Colors.danger(`✖`)}  ${Colors.bold.dim(`Errors`)}`);
         for (const [stack, result] of failed) {
-            Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
+            Colors.line(`   ${Colors.dim(stackNameToId(stack))} ${Colors.dim(result.status)}`);
             for (const [id, error] of Object.entries(result.errors)) {
                 const readable = logicalIdToCdkPath(assembly, stack, id) || id;
                 Colors.line(`   ${Colors.danger.bold(readable + ":")} ${error}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.0.0-rc.67",
+  "version": "2.0.0-rc.68",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -1353,6 +1353,17 @@ async function monitor(stack) {
               event,
               stackID: stack
             });
+            if (event.ResourceStatusReason) {
+              if (event.ResourceStatusReason.includes(
+                "Resource creation cancelled"
+              ) || event.ResourceStatusReason.includes(
+                "Resource update cancelled"
+              ) || event.ResourceStatusReason?.includes(
+                "Resource creation Initiated"
+              ))
+                continue;
+              errors[event.LogicalResourceId] = event.ResourceStatusReason;
+            }
           }
         }
         Logger.debug("Last event set to", lastEvent);
@@ -5331,7 +5342,7 @@ import { Box, Text } from "ink";
 import inkSpinner from "ink-spinner";
 function printDeploymentResults(assembly, results, remove4) {
   const success = Object.entries(results).filter(
-    ([_stack, result]) => Object.keys(result.errors).length === 0
+    ([_stack, result]) => stacks_exports.isSuccess(result.status)
   );
   if (success.length) {
     Colors.gap();
@@ -5354,13 +5365,15 @@ function printDeploymentResults(assembly, results, remove4) {
     Colors.gap();
   }
   const failed = Object.entries(results).filter(
-    ([_stack, result]) => Object.keys(result.errors).length > 0
+    ([_stack, result]) => stacks_exports.isFailed(result.status)
   );
   if (failed.length) {
     Colors.gap();
     Colors.line(`${Colors.danger(`\u2716`)}  ${Colors.bold.dim(`Errors`)}`);
     for (const [stack, result] of failed) {
-      Colors.line(`   ${Colors.dim(stackNameToId(stack))}`);
+      Colors.line(
+        `   ${Colors.dim(stackNameToId(stack))} ${Colors.dim(result.status)}`
+      );
       for (const [id, error2] of Object.entries(result.errors)) {
         const readable = logicalIdToCdkPath(assembly, stack, id) || id;
         Colors.line(`   ${Colors.danger.bold(readable + ":")} ${error2}`);
@@ -5427,8 +5440,6 @@ var init_deploy2 = __esm({
         const bus = useBus();
         const event = bus.subscribe("stack.event", (payload) => {
           const { event: event2 } = payload.properties;
-          if (event2.ResourceType === "AWS::CloudFormation::Stack")
-            return;
           setResources((previous2) => {
             if (stacks_exports.isFinal(event2.ResourceStatus)) {
               const readable = logicalIdToCdkPath(
@@ -5444,7 +5455,7 @@ var init_deploy2 = __esm({
                   `${stackNameToId(event2.StackName)} ${event2.ResourceType}`
                 ),
                 stacks_exports.isFailed(event2.ResourceStatus) ? Colors.danger(event2.ResourceStatus) : Colors.dim(event2.ResourceStatus),
-                stacks_exports.isFailed(event2.ResourceStatus) && event2.ResourceStatusReason
+                stacks_exports.isFailed(event2.ResourceStatus) && event2.ResourceStatusReason ? event2.ResourceStatusReason : ""
               );
               const { [event2.LogicalResourceId]: _, ...next } = previous2;
               return next;

package/stacks/monitor.js

@@ -78,6 +78,13 @@ export async function monitor(stack) {
                             event: event,
                             stackID: stack,
                         });
+                        if (event.ResourceStatusReason) {
+                            if (event.ResourceStatusReason.includes("Resource creation cancelled") ||
+                                event.ResourceStatusReason.includes("Resource update cancelled") ||
+                                event.ResourceStatusReason?.includes("Resource creation Initiated"))
+                                continue;
+                            errors[event.LogicalResourceId] = event.ResourceStatusReason;
+                        }
                     }
                 }
                 Logger.debug("Last event set to", lastEvent);