sst 2.0.31 → 2.0.33

package/constructs/EventBus.d.ts

@@ -152,7 +152,7 @@ export interface EventBusRuleProps {
          *         },
          *       },
          *       targets: {
-         *         myTarget1: "test/lambda.handler",
+         *         myTarget1: "src/lambda.handler",
          *       },
          *     },
          *   },
@@ -262,6 +262,15 @@ export declare class EventBus extends Construct implements SSTConstruct {
      * The name of the internally created `EventBus` instance.
      */
     get eventBusName(): string;
+    /**
+     * Get a rule
+     *
+     * @example
+     * ```js
+     * bus.getRule("myRule");
+     * ```
+     */
+    getRule(key: string): events.Rule | undefined;
     /**
      * Add rules after the EventBus has been created.
      *
@@ -280,14 +289,17 @@ export declare class EventBus extends Construct implements SSTConstruct {
      */
     addRules(scope: Construct, rules: Record<string, EventBusRuleProps>): void;
     /**
-     * Get a rule
+     * Add targets to existing rules.
      *
      * @example
      * ```js
-     * bus.getRule("myRule");
+     * bus.addRules(stack, "myRule", {
+     *   myTarget1: "src/function1.handler"
+     *   myTarget2: "src/function2.handler"
+     * });
      * ```
      */
-    getRule(key: string): events.Rule | undefined;
+    addTargets(scope: Construct, ruleKey: string, targets: Record<string, FunctionInlineDefinition | EventBusFunctionTargetProps | Queue | EventBusQueueTargetProps>): void;
     /**
      * Binds the given list of resources to all event targets in this EventBus.
      *

package/constructs/EventBus.js

@@ -56,6 +56,17 @@ export class EventBus extends Construct {
     get eventBusName() {
         return this.cdk.eventBus.eventBusName;
     }
+    /**
+     * Get a rule
+     *
+     * @example
+     * ```js
+     * bus.getRule("myRule");
+     * ```
+     */
+    getRule(key) {
+        return this.rulesData[key];
+    }
     /**
      * Add rules after the EventBus has been created.
      *
@@ -76,15 +87,24 @@ export class EventBus extends Construct {
         Object.entries(rules).forEach(([ruleKey, rule]) => this.addRule(scope, ruleKey, rule));
     }
     /**
-     * Get a rule
+     * Add targets to existing rules.
      *
      * @example
      * ```js
-     * bus.getRule("myRule");
+     * bus.addRules(stack, "myRule", {
+     *   myTarget1: "src/function1.handler"
+     *   myTarget2: "src/function2.handler"
+     * });
      * ```
      */
-    getRule(key) {
-        return this.rulesData[key];
+    addTargets(scope, ruleKey, targets) {
+        // Get rule
+        const eventsRule = this.getRule(ruleKey);
+        if (!eventsRule) {
+            throw new Error(`Cannot find the rule "${ruleKey}" in the "${this.node.id}" EventBus.`);
+        }
+        // Add targets
+        Object.entries(targets).forEach(([targetName, target]) => this.addTarget(scope, ruleKey, eventsRule, targetName, target));
     }
     /**
      * Binds the given list of resources to all event targets in this EventBus.
@@ -246,10 +266,14 @@ export class EventBus extends Construct {
         });
         this.rulesData[ruleKey] = eventsRule;
         // Create Targets
-        Object.entries(rule.targets || {}).forEach(([targetName, target]) => this.addTarget(scope, ruleKey, eventsRule, targetName, target));
+        this.addTargets(scope, ruleKey, rule.targets || {});
     }
     addTarget(scope, ruleKey, eventsRule, targetName, target) {
         this.targetsData[ruleKey] = this.targetsData[ruleKey] || {};
+        // Validate rule not redefined
+        if (this.targetsData[ruleKey][targetName]) {
+            throw new Error(`A target with name "${targetName}" already exists in rule "${ruleKey}"`);
+        }
         if (target instanceof Queue || target.queue) {
             target = target;
             this.addQueueTarget(scope, ruleKey, eventsRule, targetName, target);

package/constructs/Function.d.ts

@@ -598,6 +598,9 @@ export declare class Function extends lambda.Function implements SSTConstruct {
         };
     };
     private createUrl;
+    private isNodeRuntime;
+    static validateHandlerSet(id: string, props: FunctionProps): void;
+    static validateVpcSettings(id: string, props: FunctionProps): void;
     static buildLayers(scope: Construct, id: string, props: FunctionProps): cdk.aws_lambda.ILayerVersion[];
     static normalizeMemorySize(memorySize?: number | Size): number;
     static normalizeDiskSize(diskSize?: number | Size): cdk.Size;

package/constructs/Function.js

@@ -101,12 +101,8 @@ export class Function extends lambda.Function {
         const logRetention = props.logRetention &&
             logs.RetentionDays[props.logRetention.toUpperCase()];
         const isLiveDevEnabled = props.enableLiveDev === false ? false : true;
-        // Validate handler
-        if (!handler) {
-            throw new Error(`No handler defined for the "${id}" Lambda function`);
-        }
-        // Validate input
-        const isNodeRuntime = props.runtime.startsWith("nodejs");
+        Function.validateHandlerSet(id, props);
+        Function.validateVpcSettings(id, props);
         // Handle local development (ie. sst start)
         // - set runtime to nodejs12.x for non-Node runtimes (b/c the stub is in Node)
         // - set retry to 0. When the debugger is disconnected, the Cron construct
@@ -223,7 +219,7 @@ export class Function extends lambda.Function {
         }
         this.id = id;
         this.props = props || {};
-        if (isNodeRuntime) {
+        if (this.isNodeRuntime()) {
             // Enable reusing connections with Keep-Alive for NodeJs
             // Lambda function
             this.addEnvironment("AWS_NODEJS_CONNECTION_REUSE_ENABLED", "1", {
@@ -345,6 +341,20 @@ export class Function extends lambda.Function {
             cors: functionUrlCors.buildCorsConfig(cors),
         });
     }
+    isNodeRuntime() {
+        const { runtime } = this.props;
+        return runtime.startsWith("nodejs");
+    }
+    static validateHandlerSet(id, props) {
+        if (!props.handler) {
+            throw new Error(`No handler defined for the "${id}" Lambda function`);
+        }
+    }
+    static validateVpcSettings(id, props) {
+        if (props.securityGroups && !props.vpc) {
+            throw new Error(`Cannot configure "securityGroups" without "vpc" for the "${id}" Lambda function.`);
+        }
+    }
     static buildLayers(scope, id, props) {
         return (props.layers || []).map((layer) => {
             if (typeof layer === "string") {

package/iot.js

@@ -25,6 +25,7 @@ export const useIOT = Context.memo(async () => {
     const device = new iot.device({
         protocol: "wss",
         host: endpoint,
+        region: project.config.region,
         accessKeyId: creds.accessKeyId,
         secretKey: creds.secretAccessKey,
         sessionToken: creds.sessionToken,

package/package.json

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

package/sst.mjs

@@ -2546,6 +2546,7 @@ var init_iot = __esm({
       const device = new iot.device({
         protocol: "wss",
         host: endpoint,
+        region: project.config.region,
         accessKeyId: creds.accessKeyId,
         secretKey: creds.secretAccessKey,
         sessionToken: creds.sessionToken