sst 2.1.23 → 2.1.25

package/bootstrap.d.ts

@@ -2,4 +2,4 @@ export declare const useBootstrap: () => Promise<{
     version: string;
     bucket: string;
 }>;
-export declare function bootstrapSST(tags?: Record<string, string>, publicAccessBlockConfiguration?: boolean): Promise<void>;
+export declare function bootstrapSST(tags?: Record<string, string>, publicAccessBlockConfiguration?: boolean, qualifier?: string): Promise<void>;

package/bootstrap.js

@@ -3,7 +3,7 @@ import path from "path";
 import { bold, dim } from "colorette";
 import { spawn } from "child_process";
 import { DescribeStacksCommand, CloudFormationClient, } from "@aws-sdk/client-cloudformation";
-import { Duration, Tags, Stack, RemovalPolicy, App, CfnOutput, } from "aws-cdk-lib";
+import { App, DefaultStackSynthesizer, CfnOutput, Duration, Tags, Stack, RemovalPolicy, } from "aws-cdk-lib";
 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";
@@ -81,7 +81,7 @@ async function loadCDKStatus() {
         }
     }
 }
-export async function bootstrapSST(tags, publicAccessBlockConfiguration) {
+export async function bootstrapSST(tags, publicAccessBlockConfiguration, qualifier) {
     // Normalize input
     tags = tags || {};
     publicAccessBlockConfiguration =
@@ -93,6 +93,9 @@ export async function bootstrapSST(tags, publicAccessBlockConfiguration) {
         env: {
             region: project.config.region,
         },
+        synthesizer: new DefaultStackSynthesizer({
+            qualifier,
+        }),
     });
     // Add tags to stack
     for (const [key, value] of Object.entries(tags)) {

package/cli/commands/bootstrap.d.ts

@@ -12,6 +12,8 @@ export declare const bootstrap: (program: Program) => import("yargs").Argv<{
     role: string | undefined;
 } & {
     tags: string[] | undefined;
+} & {
+    qualifier: string | undefined;
 } & {
     "public-access-block-configuration": boolean;
 }>;

package/cli/commands/bootstrap.js

@@ -3,6 +3,10 @@ export const bootstrap = (program) => program.command("bootstrap", "Create the S
     type: "array",
     string: true,
     describe: "Tags to add for the bootstrap stack",
+})
+    .option("qualifier", {
+    type: "string",
+    describe: "A string that is added to the names of all resources in the bootstrap stack",
 })
     .option("public-access-block-configuration", {
     type: "boolean",
@@ -21,7 +25,7 @@ export const bootstrap = (program) => program.command("bootstrap", "Create the S
         Colors.line(`${Colors.primary(`➜`)}  Using tags`, tags);
     }
     const spinner = createSpinner(" Deploying bootstrap stack").start();
-    await bootstrapSST(tags, args.publicAccessBlockConfiguration);
+    await bootstrapSST(tags, args.publicAccessBlockConfiguration, args.qualifier);
     spinner.succeed(Colors.bold(` Bootstrapped account ${identity.Account} in region ${project.config.region}`));
     process.exit(0);
 });

package/package.json

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

package/runtime/iot.js

@@ -6,12 +6,12 @@ export const useIOTBridge = Context.memo(async () => {
     const iot = await useIOT();
     const topic = `${iot.prefix}/events`;
     bus.subscribe("function.success", async (evt) => {
-        iot.publish(topic, "function.success", evt.properties);
+        iot.publish(topic + "/" + evt.properties.workerID, "function.success", evt.properties);
     });
     bus.subscribe("function.error", async (evt) => {
-        iot.publish(topic, "function.error", evt.properties);
+        iot.publish(topic + "/" + evt.properties.workerID, "function.error", evt.properties);
     });
     bus.subscribe("function.ack", async (evt) => {
-        iot.publish(topic, "function.ack", evt.properties);
+        iot.publish(topic + "/" + evt.properties.workerID, "function.ack", evt.properties);
     });
 });

package/sst.mjs

@@ -2742,13 +2742,25 @@ var init_iot2 = __esm({
       const iot2 = await useIOT();
       const topic = `${iot2.prefix}/events`;
       bus.subscribe("function.success", async (evt) => {
-        iot2.publish(topic, "function.success", evt.properties);
+        iot2.publish(
+          topic + "/" + evt.properties.workerID,
+          "function.success",
+          evt.properties
+        );
       });
       bus.subscribe("function.error", async (evt) => {
-        iot2.publish(topic, "function.error", evt.properties);
+        iot2.publish(
+          topic + "/" + evt.properties.workerID,
+          "function.error",
+          evt.properties
+        );
       });
       bus.subscribe("function.ack", async (evt) => {
-        iot2.publish(topic, "function.ack", evt.properties);
+        iot2.publish(
+          topic + "/" + evt.properties.workerID,
+          "function.ack",
+          evt.properties
+        );
       });
     });
   }
@@ -2769,12 +2781,13 @@ import {
   CloudFormationClient
 } from "@aws-sdk/client-cloudformation";
 import {
+  App,
+  DefaultStackSynthesizer,
+  CfnOutput,
   Duration,
   Tags,
   Stack,
-  RemovalPolicy,
-  App,
-  CfnOutput
+  RemovalPolicy
 } from "aws-cdk-lib";
 import { Function, Runtime, Code } from "aws-cdk-lib/aws-lambda";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
@@ -2814,7 +2827,7 @@ async function loadCDKStatus() {
     }
   }
 }
-async function bootstrapSST(tags, publicAccessBlockConfiguration) {
+async function bootstrapSST(tags, publicAccessBlockConfiguration, qualifier) {
   tags = tags || {};
   publicAccessBlockConfiguration = publicAccessBlockConfiguration === false ? false : true;
   const project = useProject();
@@ -2822,7 +2835,10 @@ async function bootstrapSST(tags, publicAccessBlockConfiguration) {
   const stack = new Stack(app, STACK_NAME, {
     env: {
       region: project.config.region
-    }
+    },
+    synthesizer: new DefaultStackSynthesizer({
+      qualifier
+    })
   });
   for (const [key, value] of Object.entries(tags)) {
     Tags.of(app).add(key, value);
@@ -7818,6 +7834,9 @@ var bootstrap = (program2) => program2.command(
     type: "array",
     string: true,
     describe: "Tags to add for the bootstrap stack"
+  }).option("qualifier", {
+    type: "string",
+    describe: "A string that is added to the names of all resources in the bootstrap stack"
   }).option("public-access-block-configuration", {
     type: "boolean",
     default: true,
@@ -7838,7 +7857,11 @@ var bootstrap = (program2) => program2.command(
       Colors2.line(`${Colors2.primary(`\u279C`)}  Using tags`, tags);
     }
     const spinner = createSpinner2(" Deploying bootstrap stack").start();
-    await bootstrapSST2(tags, args.publicAccessBlockConfiguration);
+    await bootstrapSST2(
+      tags,
+      args.publicAccessBlockConfiguration,
+      args.qualifier
+    );
     spinner.succeed(
       Colors2.bold(
         ` Bootstrapped account ${identity.Account} in region ${project.config.region}`