serverless-sns-dlq 1.1.0 → 1.1.2

package/index.js

@@ -14,18 +14,19 @@ class ServerlessPlugin {
 
     this.hooks = {
       "before:deploy:deploy": this.Deploy.bind(this),
+      "before:deploy:function:packageFunction": this.DeploySingleFunction.bind(this),
     };
 
     this.region = serverless.getProvider("aws").getRegion();
 
     serverless.configSchemaHandler.defineFunctionProperties("aws", {
       type: "object",
-      properties: { setDlq: { type: "boolean" } },
+      properties: { enableSnsDlq: { type: "boolean" } },
     });
 
     serverless.configSchemaHandler.defineFunctionEventProperties("aws", "sns", {
       type: "object",
-      properties: { setDlq: { type: "boolean" } },
+      properties: { enableSnsDlq: { type: "boolean" } },
     });
   }
 
@@ -39,26 +40,56 @@ class ServerlessPlugin {
   };
 
   Deploy = async () => {
+    const accountId = await this.serverless.getProvider("aws").getAccountId();
     const functions = this.serverless.service.functions;
     const template =
       this.serverless.service.provider.compiledCloudFormationTemplate;
 
     Object.entries(functions).flatMap(
       async ([fnName, fnDef]) => {
-        if (fnDef.setDlq !== false) {
+        if (fnDef.enableSnsDlq !== false) {
           const snsEvents = (fnDef.events || [])
             .filter((evt) => evt.sns)
             .map((evt) => evt.sns);
 
-          if (snsEvents.length > 0) this._configure(template, fnName, fnDef, snsEvents);
+          if (snsEvents.length > 0) this._configure(accountId, template, fnName, fnDef, snsEvents);
         }
       }
     );
   };
 
-  _configure = (template, fnName, fnDef, snsEvents) => {
-    const accountId = (snsEvents[0].arn || snsEvents[0]).split(":")[4];
+  DeploySingleFunction = async () => {
+    const fnName = this.options.function;
+    const fnDef = this.serverless.service.functions[fnName];
 
+    if (!fnDef) {
+      this.logger.error(`Function ${fnName} not found`);
+      return;
+    }
+
+    // Skip if SNS DLQ is explicitly disabled
+    if (fnDef.enableSnsDlq === false) return;
+
+    // Check if function has SNS events
+    const snsEvents = (fnDef.events || [])
+      .filter((evt) => evt.sns)
+      .map((evt) => evt.sns);
+
+    if (snsEvents.length === 0) return;
+
+    // Calculate DLQ URL
+    const accountId = await this.serverless.getProvider("aws").getAccountId();
+    const dlqName = `${fnDef.name}-dlq`;
+    const dlqUrl = `https://sqs.${this.region}.amazonaws.com/${accountId}/${dlqName}`;
+
+    // Add DLQ_QUEUE_URL to function environment
+    if (!fnDef.environment) fnDef.environment = {};
+    fnDef.environment.DLQ_QUEUE_URL = dlqUrl;
+
+    this.logger.notice(`Added DLQ_QUEUE_URL for function ${fnName}: ${dlqUrl}`);
+  };
+
+  _configure = (accountId, template, fnName, fnDef, snsEvents) => {
     const dlqName = `${fnDef.name}-dlq`;
     this._validateQueueName(dlqName);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-sns-dlq",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Automatically attach SNS redrive policy to DLQ for every handler function specified with SNS trigger",
   "main": "index.js",
   "author": "Randy Hermawan",
@@ -19,4 +19,4 @@
   },
   "homepage": "https://github.com/randyhermawan/serverless-sns-dlq#readme",
   "dependencies": {}
-}
+}