sst 2.1.10 → 2.1.12

package/config.js

@@ -117,21 +117,32 @@ export var Config;
             .flat()
             .filter((f) => f.type === "Function")
             .filter((f) => f.data.secrets.includes(key));
-        await Promise.all(filtered.map(async (f) => {
-            const config = await lambda.send(new GetFunctionConfigurationCommand({
-                FunctionName: f.data.arn,
-            }));
-            await lambda.send(new UpdateFunctionConfigurationCommand({
-                FunctionName: f.data.arn,
-                Environment: {
-                    Variables: {
-                        ...(config.Environment?.Variables || {}),
-                        [SECRET_UPDATED_AT_ENV]: Date.now().toString(),
+        const restarted = await Promise.all(filtered.map(async (f) => {
+            // Note: in the case where the function is removed, but the metadata
+            //       is not updated, we ignore the Function not found error.
+            try {
+                const config = await lambda.send(new GetFunctionConfigurationCommand({
+                    FunctionName: f.data.arn,
+                }));
+                await lambda.send(new UpdateFunctionConfigurationCommand({
+                    FunctionName: f.data.arn,
+                    Environment: {
+                        Variables: {
+                            ...(config.Environment?.Variables || {}),
+                            [SECRET_UPDATED_AT_ENV]: Date.now().toString(),
+                        },
                     },
-                },
-            }));
+                }));
+                return true;
+            }
+            catch (e) {
+                if (e.name === "ResourceNotFoundException" &&
+                    e.message.startsWith("Function not found")) {
+                    return;
+                }
+            }
         }));
-        return filtered.length;
+        return restarted.filter(Boolean).length;
     }
     Config.restart = restart;
 })(Config || (Config = {}));

package/constructs/Function.d.ts

@@ -352,13 +352,11 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     loader: {
-     *      ".png": "file"
-     *     }
+     * nodejs: {
+     *   loader: {
+     *    ".png": "file"
      *   }
-     * })
+     * }
      * ```
      */
     loader?: Record<string, Loader>;
@@ -367,11 +365,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     install: ["pg"]
-     *   }
-     * })
+     * nodejs: {
+     *   install: ["pg"]
+     * }
      * ```
      */
     install?: string[];
@@ -380,11 +376,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     banner: "console.log('Function starting')"
-     *   }
-     * })
+     * nodejs: {
+     *   banner: "console.log('Function starting')"
+     * }
      * ```
      */
     banner?: string;
@@ -399,11 +393,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     minify: false
-     *   }
-     * })
+     * nodejs: {
+     *   minify: false
+     * }
      * ```
      */
     minify?: boolean;
@@ -414,11 +406,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     format: "esm"
-     *   }
-     * })
+     * nodejs: {
+     *   format: "esm"
+     * }
      * ```
      */
     format?: "cjs" | "esm";
@@ -429,11 +419,9 @@ export interface NodeJSProps {
      *
      * @example
      * ```js
-     * new Function(stack, "Function", {
-     *   nodejs: {
-     *     sourcemap: true
-     *   }
-     * })
+     * nodejs: {
+     *   sourcemap: true
+     * }
      * ```
      */
     sourcemap?: boolean;

package/constructs/Job.d.ts

@@ -6,7 +6,8 @@ import { Permissions } from "./util/permission.js";
 import { FunctionBindingProps } from "./util/functionBinding.js";
 import { IVpc } from "aws-cdk-lib/aws-ec2";
 export type JobMemorySize = "3 GB" | "7 GB" | "15 GB" | "145 GB";
-export type JobNodeJSProps = NodeJSProps;
+export interface JobNodeJSProps extends NodeJSProps {
+}
 export interface JobProps {
     /**
      * Path to the entry point and handler function. Of the format:

package/package.json

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

package/runtime/handlers/node.js

@@ -186,13 +186,19 @@ export const useNodeHandler = Context.memo(async () => {
             }
             catch (ex) {
                 const result = ex;
+                if ("errors" in result) {
+                    return {
+                        type: "error",
+                        errors: result.errors.flatMap((x) => [
+                            Colors.bold(x.text),
+                            x.location?.file || "",
+                            Colors.dim(x.location?.line, "│", x.location?.lineText),
+                        ]),
+                    };
+                }
                 return {
                     type: "error",
-                    errors: result.errors.flatMap((x) => [
-                        Colors.bold(x.text),
-                        x.location?.file || "",
-                        Colors.dim(x.location?.line, "│", x.location?.lineText),
-                    ]),
+                    errors: [ex.toString()],
                 };
             }
         },

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;
@@ -5056,13 +5062,19 @@ var init_node = __esm({
             };
           } catch (ex) {
             const result = ex;
+            if ("errors" in result) {
+              return {
+                type: "error",
+                errors: result.errors.flatMap((x) => [
+                  Colors.bold(x.text),
+                  x.location?.file || "",
+                  Colors.dim(x.location?.line, "\u2502", x.location?.lineText)
+                ])
+              };
+            }
             return {
               type: "error",
-              errors: result.errors.flatMap((x) => [
-                Colors.bold(x.text),
-                x.location?.file || "",
-                Colors.dim(x.location?.line, "\u2502", x.location?.lineText)
-              ])
+              errors: [ex.toString()]
             };
           }
         }
@@ -6566,27 +6578,34 @@ var init_config = __esm({
         const lambda = useAWSClient(LambdaClient);
         const metadata3 = await stacks_exports.metadata();
         const filtered = Object.values(metadata3).flat().filter((f) => f.type === "Function").filter((f) => f.data.secrets.includes(key));
-        await Promise.all(
+        const restarted = await Promise.all(
           filtered.map(async (f) => {
-            const config = await lambda.send(
-              new GetFunctionConfigurationCommand({
-                FunctionName: f.data.arn
-              })
-            );
-            await lambda.send(
-              new UpdateFunctionConfigurationCommand({
-                FunctionName: f.data.arn,
-                Environment: {
-                  Variables: {
-                    ...config.Environment?.Variables || {},
-                    [SECRET_UPDATED_AT_ENV]: Date.now().toString()
+            try {
+              const config = await lambda.send(
+                new GetFunctionConfigurationCommand({
+                  FunctionName: f.data.arn
+                })
+              );
+              await lambda.send(
+                new UpdateFunctionConfigurationCommand({
+                  FunctionName: f.data.arn,
+                  Environment: {
+                    Variables: {
+                      ...config.Environment?.Variables || {},
+                      [SECRET_UPDATED_AT_ENV]: Date.now().toString()
+                    }
                   }
-                }
-              })
-            );
+                })
+              );
+              return true;
+            } catch (e) {
+              if (e.name === "ResourceNotFoundException" && e.message.startsWith("Function not found")) {
+                return;
+              }
+            }
           })
         );
-        return filtered.length;
+        return restarted.filter(Boolean).length;
       }
       Config2.restart = restart;
     })(Config || (Config = {}));

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");