sst 2.16.3 → 2.17.0

package/bootstrap.js

@@ -3,13 +3,11 @@ import path from "path";
 import { bold, dim } from "colorette";
 import { spawn } from "child_process";
 import { DescribeStacksCommand, CloudFormationClient, } from "@aws-sdk/client-cloudformation";
-import { App, DefaultStackSynthesizer, CfnOutput, Duration, Tags, Stack, RemovalPolicy, } from "aws-cdk-lib/core";
+import { App, DefaultStackSynthesizer, CfnOutput, Tags, Stack, RemovalPolicy, } from "aws-cdk-lib/core";
 import { Function, Runtime, Code } from "aws-cdk-lib/aws-lambda";
-import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
-import { Queue } from "aws-cdk-lib/aws-sqs";
 import { Rule } from "aws-cdk-lib/aws-events";
-import { SqsQueue } from "aws-cdk-lib/aws-events-targets";
+import { LambdaFunction } from "aws-cdk-lib/aws-events-targets";
 import { BlockPublicAccess, Bucket, BucketEncryption, } from "aws-cdk-lib/aws-s3";
 import { useProject } from "./project.js";
 import { createSpinner } from "./cli/spinner.js";
@@ -22,7 +20,7 @@ const CDK_STACK_NAME = "CDKToolkit";
 const SST_STACK_NAME = "SSTBootstrap";
 const OUTPUT_VERSION = "Version";
 const OUTPUT_BUCKET = "BucketName";
-const LATEST_VERSION = "7";
+const LATEST_VERSION = "7.1";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 export const useBootstrap = Context.memo(async () => {
     Logger.debug("Initializing bootstrap context");
@@ -32,7 +30,7 @@ export const useBootstrap = Context.memo(async () => {
     ]);
     Logger.debug("Loaded bootstrap status");
     const needToBootstrapCDK = !cdkStatus;
-    const needToBootstrapSST = !sstStatus || sstStatus.version !== LATEST_VERSION;
+    const needToBootstrapSST = !sstStatus;
     if (needToBootstrapCDK || needToBootstrapSST) {
         const spinner = createSpinner("Deploying bootstrap stack, this only needs to happen once").start();
         if (needToBootstrapCDK) {
@@ -101,7 +99,8 @@ async function loadSSTStatus() {
         throw e;
     }
     // Parse stack outputs
-    let version, bucket;
+    let version;
+    let bucket;
     (result.Stacks[0].Outputs || []).forEach((o) => {
         if (o.OutputKey === OUTPUT_VERSION) {
             version = o.OutputValue;
@@ -113,6 +112,22 @@ async function loadSSTStatus() {
     if (!version || !bucket) {
         return null;
     }
+    // Need to update bootstrap stack:
+    // 1. If current MAJOR version < latest MAJOR version
+    // 2. If current MAJOR version > latest MAJOR version (has breaking change)
+    // 3. If current MAJOR version == latest MAJOR version,
+    //    but current MINOR version < latest MINOR version
+    const latestParts = LATEST_VERSION.split(".");
+    const latestMajor = parseInt(latestParts[0]);
+    const latestMinor = parseInt(latestParts[1] || "0");
+    const currentParts = version.split(".");
+    const currentMajor = parseInt(currentParts[0]);
+    const currentMinor = parseInt(currentParts[1] || "0");
+    if (currentMajor < latestMajor ||
+        currentMajor > latestMajor ||
+        currentMinor < latestMinor) {
+        return null;
+    }
     return { version, bucket };
 }
 export async function bootstrapSST() {
@@ -143,6 +158,7 @@ export async function bootstrapSST() {
         encryption: BucketEncryption.S3_MANAGED,
         removalPolicy: RemovalPolicy.DESTROY,
         autoDeleteObjects: true,
+        enforceSSL: true,
         blockPublicAccess: cdk?.publicAccessBlockConfiguration !== false
             ? BlockPublicAccess.BLOCK_ALL
             : undefined,
@@ -174,11 +190,6 @@ export async function bootstrapSST() {
             }),
         ],
     });
-    const queue = new Queue(stack, "MetadataQueue", {
-        visibilityTimeout: Duration.seconds(30),
-        retentionPeriod: Duration.minutes(2),
-    });
-    fn.addEventSource(new SqsEventSource(queue));
     const rule = new Rule(stack, "MetadataRule", {
         eventPattern: {
             source: ["aws.cloudformation"],
@@ -196,9 +207,7 @@ export async function bootstrapSST() {
             },
         },
     });
-    rule.addTarget(new SqsQueue(queue, {
-        retryAttempts: 10,
-    }));
+    rule.addTarget(new LambdaFunction(fn));
     // Create stack outputs to store bootstrap stack info
     new CfnOutput(stack, OUTPUT_VERSION, { value: LATEST_VERSION });
     new CfnOutput(stack, OUTPUT_BUCKET, { value: bucket.bucketName });

package/constructs/NextjsSite.d.ts

@@ -1,5 +1,5 @@
 import { Construct } from "constructs";
-import { Function as CdkFunction } from "aws-cdk-lib/aws-lambda";
+import { Function as CdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { Distribution } from "aws-cdk-lib/aws-cloudfront";
 import { EdgeFunction } from "./EdgeFunction.js";
 import { SsrSite, SsrSiteProps } from "./SsrSite.js";
@@ -21,6 +21,9 @@ export interface NextjsSiteProps extends Omit<SsrSiteProps, "nodejs"> {
      * @default Server function is not kept warm
      */
     warm?: number;
+    cdk?: SsrSiteProps["cdk"] & {
+        revalidation?: Pick<FunctionProps, "vpc" | "vpcSubnets">;
+    };
 }
 /**
  * The `NextjsSite` construct is a higher level CDK construct that makes it easy to create a Next.js app.

package/constructs/NextjsSite.js

@@ -40,6 +40,7 @@ export class NextjsSite extends SsrSite {
     createRevalidation() {
         if (!this.serverLambdaForRegional && !this.serverLambdaForEdge)
             return;
+        const { cdk } = this.props;
         const queue = new Queue(this, "RevalidationQueue", {
             fifo: true,
             receiveMessageWaitTime: CdkDuration.seconds(20),
@@ -50,6 +51,7 @@ export class NextjsSite extends SsrSite {
             code: Code.fromAsset(path.join(this.props.path, ".open-next", "revalidation-function")),
             runtime: Runtime.NODEJS_18_X,
             timeout: CdkDuration.seconds(30),
+            ...cdk?.revalidation,
         });
         consumer.addEventSource(new SqsEventSource(queue, { batchSize: 5 }));
         // Allow server to send messages to the queue

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.16.3",
+  "version": "2.17.0",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/node.js

@@ -186,11 +186,13 @@ export const useNodeHandler = Context.memo(async () => {
                             ? "--arch=arm64"
                             : "--arch=x64");
                     }
-                    await new Promise((resolve) => {
-                        const process = exec(cmd.join(" "), {
-                            cwd: input.out,
+                    await new Promise((resolve, reject) => {
+                        exec(cmd.join(" "), { cwd: input.out }, (error) => {
+                            if (error) {
+                                reject(error);
+                            }
+                            resolve();
                         });
-                        process.on("exit", () => resolve());
                     });
                 }
                 if (input.mode === "start") {

package/sst.mjs

@@ -4517,11 +4517,13 @@ var init_node = __esm({
                   input.props.architecture === "arm_64" ? "--arch=arm64" : "--arch=x64"
                 );
               }
-              await new Promise((resolve) => {
-                const process2 = exec2(cmd.join(" "), {
-                  cwd: input.out
+              await new Promise((resolve, reject) => {
+                exec2(cmd.join(" "), { cwd: input.out }, (error2) => {
+                  if (error2) {
+                    reject(error2);
+                  }
+                  resolve();
                 });
-                process2.on("exit", () => resolve());
               });
             }
             if (input.mode === "start") {
@@ -5362,17 +5364,14 @@ import {
   App,
   DefaultStackSynthesizer,
   CfnOutput,
-  Duration,
   Tags,
   Stack,
   RemovalPolicy
 } from "aws-cdk-lib/core";
 import { Function, Runtime as Runtime2, Code } from "aws-cdk-lib/aws-lambda";
-import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { PolicyStatement } from "aws-cdk-lib/aws-iam";
-import { Queue } from "aws-cdk-lib/aws-sqs";
 import { Rule } from "aws-cdk-lib/aws-events";
-import { SqsQueue } from "aws-cdk-lib/aws-events-targets";
+import { LambdaFunction } from "aws-cdk-lib/aws-events-targets";
 import {
   BlockPublicAccess,
   Bucket,
@@ -5422,7 +5421,8 @@ async function loadSSTStatus() {
     }
     throw e;
   }
-  let version2, bucket;
+  let version2;
+  let bucket;
   (result.Stacks[0].Outputs || []).forEach((o) => {
     if (o.OutputKey === OUTPUT_VERSION) {
       version2 = o.OutputValue;
@@ -5433,6 +5433,15 @@ async function loadSSTStatus() {
   if (!version2 || !bucket) {
     return null;
   }
+  const latestParts = LATEST_VERSION.split(".");
+  const latestMajor = parseInt(latestParts[0]);
+  const latestMinor = parseInt(latestParts[1] || "0");
+  const currentParts = version2.split(".");
+  const currentMajor = parseInt(currentParts[0]);
+  const currentMinor = parseInt(currentParts[1] || "0");
+  if (currentMajor < latestMajor || currentMajor > latestMajor || currentMinor < latestMinor) {
+    return null;
+  }
   return { version: version2, bucket };
 }
 async function bootstrapSST() {
@@ -5460,6 +5469,7 @@ async function bootstrapSST() {
     encryption: BucketEncryption.S3_MANAGED,
     removalPolicy: RemovalPolicy.DESTROY,
     autoDeleteObjects: true,
+    enforceSSL: true,
     blockPublicAccess: cdk?.publicAccessBlockConfiguration !== false ? BlockPublicAccess.BLOCK_ALL : void 0
   });
   const fn = new Function(stack, "MetadataHandler", {
@@ -5488,11 +5498,6 @@ async function bootstrapSST() {
       })
     ]
   });
-  const queue = new Queue(stack, "MetadataQueue", {
-    visibilityTimeout: Duration.seconds(30),
-    retentionPeriod: Duration.minutes(2)
-  });
-  fn.addEventSource(new SqsEventSource(queue));
   const rule = new Rule(stack, "MetadataRule", {
     eventPattern: {
       source: ["aws.cloudformation"],
@@ -5510,11 +5515,7 @@ async function bootstrapSST() {
       }
     }
   });
-  rule.addTarget(
-    new SqsQueue(queue, {
-      retryAttempts: 10
-    })
-  );
+  rule.addTarget(new LambdaFunction(fn));
   new CfnOutput(stack, OUTPUT_VERSION, { value: LATEST_VERSION });
   new CfnOutput(stack, OUTPUT_BUCKET, { value: bucket.bucketName });
   const asm = app.synth();
@@ -5595,7 +5596,7 @@ var init_bootstrap = __esm({
     SST_STACK_NAME = "SSTBootstrap";
     OUTPUT_VERSION = "Version";
     OUTPUT_BUCKET = "BucketName";
-    LATEST_VERSION = "7";
+    LATEST_VERSION = "7.1";
     __dirname2 = url8.fileURLToPath(new URL(".", import.meta.url));
     useBootstrap = Context.memo(async () => {
       Logger.debug("Initializing bootstrap context");
@@ -5605,7 +5606,7 @@ var init_bootstrap = __esm({
       ]);
       Logger.debug("Loaded bootstrap status");
       const needToBootstrapCDK = !cdkStatus;
-      const needToBootstrapSST = !sstStatus || sstStatus.version !== LATEST_VERSION;
+      const needToBootstrapSST = !sstStatus;
       if (needToBootstrapCDK || needToBootstrapSST) {
         const spinner = createSpinner(
           "Deploying bootstrap stack, this only needs to happen once"