sst 2.11.8 → 2.11.9

package/constructs/EventBus.d.ts

@@ -426,6 +426,7 @@ export declare class EventBus extends Construct implements SSTConstruct {
     getFunctionBinding(): FunctionBindingProps;
     private retrierQueue;
     private retrierFn;
+    private retrierMap;
     private getRetrier;
     private createEventBus;
     private addRule;

package/constructs/EventBus.js

@@ -8,7 +8,9 @@ import { getFunctionRef, isCDKConstruct } from "./Construct.js";
 import { Function as Fn, } from "./Function.js";
 import { SqsEventSource } from "aws-cdk-lib/aws-lambda-event-sources";
 import { SqsDestination } from "aws-cdk-lib/aws-lambda-destinations";
+import url from "url";
 import path from "path";
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
 /////////////////////
 // Construct
 /////////////////////
@@ -231,12 +233,17 @@ export class EventBus extends Construct {
     }
     retrierQueue;
     retrierFn;
+    retrierMap = {};
     getRetrier() {
+        const app = this.node.root;
         if (this.retrierFn && this.retrierQueue) {
             return { fn: this.retrierFn, queue: this.retrierQueue };
         }
-        this.retrierQueue = new sqs.Queue(this, `RetrierQueue`);
+        this.retrierQueue = new sqs.Queue(this, `RetrierQueue`, {
+            queueName: app.logicalPrefixedName(this.node.id + "Retrier"),
+        });
         this.retrierFn = new lambda.Function(this, `RetrierFunction`, {
+            functionName: app.logicalPrefixedName(this.node.id + "Retrier"),
             runtime: lambda.Runtime.NODEJS_14_X,
             handler: "index.handler",
             code: lambda.Code.fromAsset(path.join(__dirname, "../support/event-bus-retrier")),
@@ -350,7 +357,20 @@ export class EventBus extends Construct {
         const count = this.subs.get(type) || 0 + 1;
         this.subs.set(type, count);
         const name = `${type.replaceAll(/[^a-zA-Z_]/g, "_")}_${count}`;
-        const fn = Fn.fromDefinition(this, name, target);
+        const retries = props?.retries || this.props.defaults?.retries;
+        const fn = (() => {
+            if (retries) {
+                const retrier = this.getRetrier();
+                const fn = Fn.fromDefinition(this, name, target, {
+                    onFailure: new SqsDestination(retrier.queue),
+                });
+                this.retrierMap[fn.functionArn] = retries;
+                retrier.fn.addEnvironment(`RETRIES`, JSON.stringify(this.retrierMap));
+                fn.grantInvoke(retrier.fn);
+                return fn;
+            }
+            return Fn.fromDefinition(this, name, target);
+        })();
         this.addRule(this, name + "_rule", {
             pattern: {
                 detailType: [type],
@@ -374,7 +394,8 @@ export class EventBus extends Construct {
             target = target;
             targetProps = target.cdk?.target;
             functionDefinition = target.function;
-            retries = target.retries;
+            if (target.retries)
+                retries = target.retries;
         }
         else {
             target = target;
@@ -385,15 +406,6 @@ export class EventBus extends Construct {
         this.targetsData[ruleKey][targetName] = fn;
         // Create target
         eventsRule.addTarget(new LambdaFunctionTarget(fn, targetProps));
-        // Configure retrier
-        if (retries) {
-            const retrier = this.getRetrier();
-            retrier.fn.addEnvironment(`RETRIER_${retrier.fn.functionName}`, retries.toString());
-            fn.grantInvoke(retrier.fn);
-            fn.configureAsyncInvoke({
-                onFailure: new SqsDestination(retrier.queue),
-            });
-        }
         // Attach existing permissions
         this.permissionsAttachedForAllTargets.forEach((permissions) => fn.attachPermissions(permissions));
         fn.bind(this.bindingForAllTargets);

package/package.json

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