sst 2.1.11 → 2.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.1.11",
+  "version": "2.1.12",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -3180,8 +3180,10 @@ async function monitor(stack) {
                 "Resource creation cancelled"
               ) || event.ResourceStatusReason.includes(
                 "Resource update cancelled"
-              ) || event.ResourceStatusReason?.includes(
+              ) || event.ResourceStatusReason.includes(
                 "Resource creation Initiated"
+              ) || event.ResourceStatusReason.startsWith(
+                "The following resource(s) failed to"
               ))
                 continue;
               errors[event.LogicalResourceId] = event.ResourceStatusReason;
@@ -3200,7 +3202,11 @@ async function monitor(stack) {
           "Resource creation cancelled"
         ) || resource.ResourceStatusReason?.includes(
           "Resource update cancelled"
-        ) || resource.ResourceStatusReason?.includes("Resource creation Initiated"))
+        ) || resource.ResourceStatusReason?.includes(
+          "Resource creation Initiated"
+        ) || resource.ResourceStatusReason?.startsWith(
+          "The following resource(s) failed to"
+        ))
           continue;
         if (resource.ResourceStatusReason)
           errors[resource.LogicalResourceId] = resource.ResourceStatusReason;

package/stacks/monitor.js

@@ -81,7 +81,9 @@ export async function monitor(stack) {
                         if (event.ResourceStatusReason) {
                             if (event.ResourceStatusReason.includes("Resource creation cancelled") ||
                                 event.ResourceStatusReason.includes("Resource update cancelled") ||
-                                event.ResourceStatusReason?.includes("Resource creation Initiated"))
+                                event.ResourceStatusReason.includes("Resource creation Initiated") ||
+                                // ie. The following resource(s) failed to update: [MyResource10A5921D].
+                                event.ResourceStatusReason.startsWith("The following resource(s) failed to"))
                                 continue;
                             errors[event.LogicalResourceId] = event.ResourceStatusReason;
                         }
@@ -97,7 +99,9 @@ export async function monitor(stack) {
             for (const resource of resources.StackResources || []) {
                 if (resource.ResourceStatusReason?.includes("Resource creation cancelled") ||
                     resource.ResourceStatusReason?.includes("Resource update cancelled") ||
-                    resource.ResourceStatusReason?.includes("Resource creation Initiated"))
+                    resource.ResourceStatusReason?.includes("Resource creation Initiated") ||
+                    // ie. The following resource(s) failed to update: [MyResource10A5921D].
+                    resource.ResourceStatusReason?.startsWith("The following resource(s) failed to"))
                     continue;
                 if (resource.ResourceStatusReason)
                     errors[resource.LogicalResourceId] = resource.ResourceStatusReason;

package/support/script-function/index.mjs

@@ -32746,14 +32746,11 @@ function safeHandler(block) {
           );
         }
       }
-      const reason = [
-        e.message,
-        `Logs: https://${process.env.AWS_REGION}.console.aws.amazon.com/cloudwatch/home?region=${process.env.AWS_REGION}#logsV2:log-groups/log-group/${encodeURIComponent(
-          process.env.AWS_LAMBDA_LOG_GROUP_NAME
-        )}/log-events/${encodeURIComponent(
-          process.env.AWS_LAMBDA_LOG_STREAM_NAME
-        )}`
-      ].join("\n");
+      const reason = e.reason || `${e.message} - Logs: https://${process.env.AWS_REGION}.console.aws.amazon.com/cloudwatch/home?region=${process.env.AWS_REGION}#logsV2:log-groups/log-group/${encodeURIComponent(
+        process.env.AWS_LAMBDA_LOG_GROUP_NAME
+      )}/log-events/${encodeURIComponent(
+        process.env.AWS_LAMBDA_LOG_STREAM_NAME
+      )}`;
       await submitResponse("FAILED", event, { reason });
     }
   };
@@ -32838,6 +32835,14 @@ async function invokeUserFunction(functionName, payload) {
       Payload: Buffer.from(JSON.stringify(payload))
     })
   );
+  if (resp.FunctionError) {
+    const payload2 = JSON.parse(Buffer.from(resp.Payload).toString());
+    const error = new Error();
+    error.reason = `${payload2.errorType}: ${payload2.errorMessage} - https://${process.env.AWS_REGION}.console.aws.amazon.com/cloudwatch/home?region=${process.env.AWS_REGION}#logsV2:log-groups/log-group/${encodeURIComponent(
+      `/aws/lambda/${functionName}`
+    )}`;
+    throw error;
+  }
   log(`response`, resp);
 }
 __name(invokeUserFunction, "invokeUserFunction");