sst 2.23.0 → 2.23.1

package/bootstrap.d.ts

@@ -2,4 +2,4 @@ export declare const useBootstrap: () => Promise<{
     version: string;
     bucket: string;
 }>;
-export declare function bootstrapSST(): Promise<void>;
+export declare function bootstrapSST(cdkBucket: string): Promise<void>;

package/bootstrap.js

@@ -37,9 +37,13 @@ export const useBootstrap = Context.memo(async () => {
             : "Updating bootstrap stack").start();
         if (needToBootstrapCDK) {
             await bootstrapCDK();
+            // fetch bootstrap status
+            cdkStatus = await loadCDKStatus();
+            if (cdkStatus.status !== "ready")
+                throw new VisibleError("Failed to load bootstrap stack status");
         }
         if (needToBootstrapSST) {
-            await bootstrapSST();
+            await bootstrapSST(cdkStatus.bucket);
             // fetch bootstrap status
             sstStatus = await loadSSTStatus();
             if (sstStatus.status !== "ready")
@@ -60,18 +64,31 @@ async function loadCDKStatus() {
         if (!stacks || stacks.length === 0)
             return { status: "bootstrap" };
         // Check CDK bootstrap stack deployed successfully
-        if (!["CREATE_COMPLETE", "UPDATE_COMPLETE"].includes(stacks[0].StackStatus)) {
+        if (![
+            "CREATE_COMPLETE",
+            "UPDATE_COMPLETE",
+            "UPDATE_ROLLBACK_COMPLETE",
+        ].includes(stacks[0].StackStatus)) {
             return { status: "bootstrap" };
         }
         // Check CDK bootstrap stack is up to date
         // note: there is no a programmatical way to get the minimal required version
         //       of CDK bootstrap stack. We are going to hardcode it to 14 for now,
         //       which is the latest version as of CDK v2.62.2
-        const output = stacks[0].Outputs?.find((o) => o.OutputKey === "BootstrapVersion");
-        if (!output || parseInt(output.OutputValue) < 14) {
+        let version;
+        let bucket;
+        const output = stacks[0].Outputs?.forEach((o) => {
+            if (o.OutputKey === "BootstrapVersion") {
+                version = parseInt(o.OutputValue);
+            }
+            else if (o.OutputKey === "BucketName") {
+                bucket = o.OutputValue;
+            }
+        });
+        if (!version || version < 14 || !bucket) {
             return { status: "update" };
         }
-        return { status: "ready" };
+        return { status: "ready", version, bucket };
     }
     catch (e) {
         if (e.name === "ValidationError" &&
@@ -133,7 +150,7 @@ async function loadSSTStatus() {
     }
     return { status: "ready", version, bucket };
 }
-export async function bootstrapSST() {
+export async function bootstrapSST(cdkBucket) {
     const { region, bootstrap, cdk } = useProject().config;
     // Create bootstrap stack
     const app = new App();
@@ -157,10 +174,10 @@ export async function bootstrapSST() {
         Tags.of(app).add(key, value);
     }
     // Create S3 bucket to store stacks metadata
-    const bucket = bootstrap?.useExistingBucket
+    const bucket = bootstrap?.useCdkBucket
         ? {
-            bucketName: bootstrap.useExistingBucket,
-            bucketArn: `arn:${stack.partition}:s3:::${bootstrap.useExistingBucket}`,
+            bucketName: cdkBucket,
+            bucketArn: `arn:${stack.partition}:s3:::${cdkBucket}`,
         }
         : new Bucket(stack, region, {
             encryption: BucketEncryption.S3_MANAGED,

package/package.json

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

package/project.d.ts

@@ -16,7 +16,7 @@ export interface ConfigOptions {
         disableParameterizedStackNameCheck?: boolean;
     };
     bootstrap?: {
-        useExistingBucket?: string;
+        useCdkBucket?: boolean;
         stackName?: string;
         tags?: Record<string, string>;
     };

package/sst.mjs

@@ -5888,16 +5888,26 @@ async function loadCDKStatus() {
     );
     if (!stacks || stacks.length === 0)
       return { status: "bootstrap" };
-    if (!["CREATE_COMPLETE", "UPDATE_COMPLETE"].includes(stacks[0].StackStatus)) {
+    if (![
+      "CREATE_COMPLETE",
+      "UPDATE_COMPLETE",
+      "UPDATE_ROLLBACK_COMPLETE"
+    ].includes(stacks[0].StackStatus)) {
       return { status: "bootstrap" };
     }
-    const output = stacks[0].Outputs?.find(
-      (o) => o.OutputKey === "BootstrapVersion"
-    );
-    if (!output || parseInt(output.OutputValue) < 14) {
+    let version2;
+    let bucket;
+    const output = stacks[0].Outputs?.forEach((o) => {
+      if (o.OutputKey === "BootstrapVersion") {
+        version2 = parseInt(o.OutputValue);
+      } else if (o.OutputKey === "BucketName") {
+        bucket = o.OutputValue;
+      }
+    });
+    if (!version2 || version2 < 14 || !bucket) {
       return { status: "update" };
     }
-    return { status: "ready" };
+    return { status: "ready", version: version2, bucket };
   } catch (e) {
     if (e.name === "ValidationError" && e.message === `Stack with id ${stackName} does not exist`) {
       return { status: "bootstrap" };
@@ -5946,7 +5956,7 @@ async function loadSSTStatus() {
   }
   return { status: "ready", version: version2, bucket };
 }
-async function bootstrapSST() {
+async function bootstrapSST(cdkBucket) {
   const { region, bootstrap: bootstrap2, cdk } = useProject().config;
   const app = new App();
   const stackName = bootstrap2?.stackName || SST_STACK_NAME;
@@ -5967,9 +5977,9 @@ async function bootstrapSST() {
   for (const [key, value] of Object.entries(bootstrap2?.tags || {})) {
     Tags.of(app).add(key, value);
   }
-  const bucket = bootstrap2?.useExistingBucket ? {
-    bucketName: bootstrap2.useExistingBucket,
-    bucketArn: `arn:${stack.partition}:s3:::${bootstrap2.useExistingBucket}`
+  const bucket = bootstrap2?.useCdkBucket ? {
+    bucketName: cdkBucket,
+    bucketArn: `arn:${stack.partition}:s3:::${cdkBucket}`
   } : new Bucket(stack, region, {
     encryption: BucketEncryption.S3_MANAGED,
     removalPolicy: RemovalPolicy.DESTROY,
@@ -6133,9 +6143,12 @@ var init_bootstrap = __esm({
         ).start();
         if (needToBootstrapCDK) {
           await bootstrapCDK();
+          cdkStatus = await loadCDKStatus();
+          if (cdkStatus.status !== "ready")
+            throw new VisibleError("Failed to load bootstrap stack status");
         }
         if (needToBootstrapSST) {
-          await bootstrapSST();
+          await bootstrapSST(cdkStatus.bucket);
           sstStatus = await loadSSTStatus();
           if (sstStatus.status !== "ready")
             throw new VisibleError("Failed to load bootstrap stack status");