sst 2.22.1 → 2.22.3

package/cli/commands/deploy.js

@@ -91,7 +91,7 @@ export const deploy = (program) => program.command("deploy [filter]", "Deploy yo
     printDeploymentResults(assembly, results);
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
         process.exit(1);
-    fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
+    fs.writeFile(project.config.outputs || path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
     // Update app state
     await saveAppMetadata({ mode: "deploy" });
     process.exit(0);

package/cli/commands/dev.js

@@ -232,7 +232,8 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
             }
             lastDeployed = nextChecksum;
             // Write outputs.json
-            fs.writeFile(path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
+            fs.writeFile(project.config.outputs ||
+                path.join(project.paths.out, "outputs.json"), JSON.stringify(mapValues(results, (val) => val.outputs), null, 2));
             isWorking = false;
             if (isDirty)
                 build();

package/constructs/Cognito.d.ts

@@ -228,4 +228,5 @@ export declare class Cognito extends Construct implements SSTConstruct {
     private createAuthRole;
     private createUnauthRole;
     private buildSignInAliases;
+    private cognitoIdentityName;
 }

package/constructs/Cognito.js

@@ -310,13 +310,14 @@ export class Cognito extends Construct {
         return lambda;
     }
     createAuthRole(identityPool) {
+        const identityName = this.cognitoIdentityName();
         const role = new Role(this, "IdentityPoolAuthRole", {
-            assumedBy: new FederatedPrincipal("cognito-identity.amazonaws.com", {
+            assumedBy: new FederatedPrincipal(identityName, {
                 StringEquals: {
-                    "cognito-identity.amazonaws.com:aud": identityPool.ref,
+                    [`${identityName}:aud`]: identityPool.ref,
                 },
                 "ForAnyValue:StringLike": {
-                    "cognito-identity.amazonaws.com:amr": "authenticated",
+                    [`${identityName}:amr`]: "authenticated",
                 },
             }, "sts:AssumeRoleWithWebIdentity"),
         });
@@ -332,13 +333,14 @@ export class Cognito extends Construct {
         return role;
     }
     createUnauthRole(identityPool) {
+        const identityName = this.cognitoIdentityName();
         const role = new Role(this, "IdentityPoolUnauthRole", {
-            assumedBy: new FederatedPrincipal("cognito-identity.amazonaws.com", {
+            assumedBy: new FederatedPrincipal(identityName, {
                 StringEquals: {
-                    "cognito-identity.amazonaws.com:aud": identityPool.ref,
+                    [`${identityName}:aud`]: identityPool.ref,
                 },
                 "ForAnyValue:StringLike": {
-                    "cognito-identity.amazonaws.com:amr": "unauthenticated",
+                    [`${identityName}:amr`]: "unauthenticated",
                 },
             }, "sts:AssumeRoleWithWebIdentity"),
         });
@@ -360,4 +362,9 @@ export class Cognito extends Construct {
             preferredUsername: login.includes("preferredUsername"),
         };
     }
+    cognitoIdentityName() {
+        return Stack.of(this).region.startsWith("us-gov-")
+            ? "cognito-identity-us-gov.amazonaws.com"
+            : "cognito-identity.amazonaws.com";
+    }
 }

package/constructs/Job.d.ts

@@ -23,12 +23,24 @@ export interface JobContainerProps {
     cmd: string[];
 }
 export interface JobProps {
+    /**
+     * The CPU architecture of the job.
+     * @default "x86_64"
+     * @example
+     * ```js
+     * new Job(stack, "MyJob", {
+     *   architecture: "arm_64",
+     *   handler: "src/job.handler",
+     * })
+     * ```
+     */
+    architecture?: "x86_64" | "arm_64";
     /**
      * The runtime environment for the job.
      * @default "nodejs"
      * @example
      * ```js
-     * new Function(stack, "Function", {
+     * new Job(stack, "MyJob", {
      *   runtime: "container",
      *   handler: "src/job",
      * })
@@ -295,6 +307,7 @@ export declare class Job extends Construct implements SSTConstruct {
     private attachPermissionsForCodeBuild;
     private addEnvironmentForCodeBuild;
     private validateContainerProps;
+    private validateMemoryProps;
     private normalizeMemorySize;
     private normalizeTimeout;
     private convertJobRuntimeToFunctionRuntime;

package/constructs/Job.js

@@ -48,6 +48,7 @@ export class Job extends Construct {
         this.props = props;
         const isLiveDevEnabled = app.mode === "dev" && (this.props.enableLiveDev === false ? false : true);
         this.validateContainerProps();
+        this.validateMemoryProps();
         this.job = this.createCodeBuildJob();
         if (!stack.isActive) {
             this._jobManager = this.createJobManager();
@@ -191,7 +192,7 @@ export class Job extends Construct {
         });
     }
     buildCodeBuildProjectCode() {
-        const { handler, runtime, container } = this.props;
+        const { handler, architecture, runtime, container } = this.props;
         useDeferredTasks().add(async () => {
             // Build function
             const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
@@ -205,12 +206,15 @@ export class Job extends Construct {
             if (runtime === "container") {
                 const image = LinuxBuildImage.fromAsset(this, "ContainerImage", {
                     directory: handler,
-                    platform: Platform.custom("linux/amd64"),
+                    platform: architecture === "arm_64"
+                        ? Platform.custom("linux/arm64")
+                        : Platform.custom("linux/amd64"),
                 });
                 image.repository?.grantPull(this.job.role);
                 const project = this.job.node.defaultChild;
                 project.environment = {
                     ...project.environment,
+                    type: architecture === "arm_64" ? "ARM_CONTAINER" : "LINUX_CONTAINER",
                     image: image.imageId,
                     imagePullCredentialsType: "SERVICE_ROLE",
                 };
@@ -259,9 +263,14 @@ export class Job extends Construct {
             const code = AssetCode.fromAsset(result.out);
             const codeConfig = code.bind(this);
             const project = this.job.node.defaultChild;
-            const image = LinuxBuildImage.fromDockerRegistry("amazon/aws-lambda-nodejs:16");
+            const image = LinuxBuildImage.fromDockerRegistry(
+            // ARM images can be found here https://hub.docker.com/r/amazon/aws-lambda-nodejs
+            architecture === "arm_64"
+                ? "amazon/aws-lambda-nodejs:16.2023.07.13.14"
+                : "amazon/aws-lambda-nodejs:16");
             project.environment = {
                 ...project.environment,
+                type: architecture === "arm_64" ? "ARM_CONTAINER" : "LINUX_CONTAINER",
                 image: image.imageId,
             };
             image.repository?.grantPull(this.job.role);
@@ -351,6 +360,14 @@ export class Job extends Construct {
             }
         }
     }
+    validateMemoryProps() {
+        const { architecture, memorySize } = this.props;
+        if (architecture === "arm_64") {
+            if (memorySize === "7 GB" || memorySize === "145 GB") {
+                throw new Error(`ARM architecture only supports "3 GB" and "15 GB" memory sizes for the ${this.node.id} Job.`);
+            }
+        }
+    }
     normalizeMemorySize(memorySize) {
         if (memorySize === "3 GB") {
             return ComputeType.SMALL;

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.22.1",
+  "version": "2.22.3",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -66,7 +66,7 @@
     "cross-spawn": "^7.0.3",
     "dendriform-immer-patch-optimiser": "^2.1.0",
     "dotenv": "^16.0.3",
-    "esbuild": "0.18.11",
+    "esbuild": "0.18.13",
     "express": "^4.18.2",
     "fast-jwt": "^1.6.1",
     "get-port": "^6.1.2",
@@ -117,7 +117,7 @@
     "archiver": "^5.3.1",
     "tsx": "^3.12.1",
     "typescript": "^4.9.5",
-    "vitest": "^0.28.3"
+    "vitest": "^0.33.0"
   },
   "peerDependencies": {
     "@sls-next/lambda-at-edge": "^3.7.0"

package/project.d.ts

@@ -11,6 +11,7 @@ export interface ConfigOptions {
     profile?: string;
     role?: string;
     ssmPrefix?: string;
+    outputs?: string;
     advanced?: {
         disableParameterizedStackNameCheck?: boolean;
     };

package/runtime/handlers/go.js

@@ -64,8 +64,8 @@ export const useGoHandler = Context.memo(async () => {
                     const result = await execAsync([
                         "go",
                         "build",
-                        ...(ldFlags ? [`-ldflags "${ldFlags.join(" ")}"`] : []),
-                        ...(buildTags ? [`-t ${buildTags.join(" ")}`] : []),
+                        ...(ldFlags.length ? [`-ldflags "${ldFlags.join(" ")}"`] : []),
+                        ...(buildTags.length ? [`-tags ${buildTags.join(" ")}`] : []),
                         `-o "${target}"`,
                         `./${srcPath}`,
                     ].join(" "), {
@@ -89,8 +89,8 @@ export const useGoHandler = Context.memo(async () => {
                     await execAsync([
                         "go",
                         "build",
-                        ...(ldFlags ? [`-ldflags "${ldFlags.join(" ")}"`] : []),
-                        ...(buildTags ? [`-t ${buildTags.join(" ")}`] : []),
+                        ...(ldFlags.length ? [`-ldflags "${ldFlags.join(" ")}"`] : []),
+                        ...(buildTags.length ? [`-tags ${buildTags.join(" ")}`] : []),
                         `-o "${target}"`,
                         `./${srcPath}`,
                     ].join(" "), {

package/runtime/handlers/node.js

@@ -15,6 +15,11 @@ export const useNodeHandler = Context.memo(async () => {
     const workers = await useRuntimeWorkers();
     const handlers = useRuntimeHandlers();
     const cache = {};
+    process.on("exit", () => {
+        for (const { ctx } of Object.values(cache)) {
+            ctx.dispose();
+        }
+    });
     const project = useProject();
     const threads = new Map();
     handlers.register({

package/sst.mjs

@@ -5356,6 +5356,11 @@ var init_node = __esm({
       const workers = await useRuntimeWorkers();
       const handlers = useRuntimeHandlers();
       const cache = {};
+      process.on("exit", () => {
+        for (const { ctx } of Object.values(cache)) {
+          ctx.dispose();
+        }
+      });
       const project = useProject();
       const threads = /* @__PURE__ */ new Map();
       handlers.register({
@@ -5670,8 +5675,8 @@ var init_go = __esm({
                 [
                   "go",
                   "build",
-                  ...ldFlags ? [`-ldflags "${ldFlags.join(" ")}"`] : [],
-                  ...buildTags ? [`-t ${buildTags.join(" ")}`] : [],
+                  ...ldFlags.length ? [`-ldflags "${ldFlags.join(" ")}"`] : [],
+                  ...buildTags.length ? [`-tags ${buildTags.join(" ")}`] : [],
                   `-o "${target}"`,
                   `./${srcPath}`
                 ].join(" "),
@@ -5697,8 +5702,8 @@ var init_go = __esm({
                 [
                   "go",
                   "build",
-                  ...ldFlags ? [`-ldflags "${ldFlags.join(" ")}"`] : [],
-                  ...buildTags ? [`-t ${buildTags.join(" ")}`] : [],
+                  ...ldFlags.length ? [`-ldflags "${ldFlags.join(" ")}"`] : [],
+                  ...buildTags.length ? [`-tags ${buildTags.join(" ")}`] : [],
                   `-o "${target}"`,
                   `./${srcPath}`
                 ].join(" "),
@@ -8655,7 +8660,7 @@ var dev = (program2) => program2.command(
         }
         lastDeployed = nextChecksum;
         fs19.writeFile(
-          path22.join(project.paths.out, "outputs.json"),
+          project.config.outputs || path22.join(project.paths.out, "outputs.json"),
           JSON.stringify(
             mapValues(results, (val) => val.outputs),
             null,
@@ -9185,7 +9190,7 @@ Are you sure you want to deploy to this stage? (y/N) `,
     if (Object.values(results).some((stack) => Stacks.isFailed(stack.status)))
       process.exit(1);
     fs18.writeFile(
-      path21.join(project.paths.out, "outputs.json"),
+      project.config.outputs || path21.join(project.paths.out, "outputs.json"),
       JSON.stringify(
         mapValues(results, (val) => val.outputs),
         null,