@effortless-aws/cli 0.9.3 → 0.10.0

package/dist/cli/index.js

@@ -3951,16 +3951,8 @@ var cleanupOrphanedFunctions = (project, stage) => Effect21.gen(function* () {
 
 // src/aws/sqs.ts
 import { Effect as Effect22 } from "effect";
-var ensureFifoQueue = (input) => Effect22.gen(function* () {
-  const {
-    name,
-    visibilityTimeout = 30,
-    retentionPeriod = 345600,
-    delay = 0,
-    contentBasedDeduplication = true,
-    tags
-  } = input;
-  const queueName = `${name}.fifo`;
+var ensureSingleFifoQueue = (opts) => Effect22.gen(function* () {
+  const { queueName, attributes, tags } = opts;
   const existingUrl = yield* sqs_exports.make("get_queue_url", {
     QueueName: queueName
   }).pipe(
@@ -3975,13 +3967,7 @@ var ensureFifoQueue = (input) => Effect22.gen(function* () {
     yield* Effect22.logDebug(`Creating FIFO queue ${queueName}...`);
     const result = yield* sqs_exports.make("create_queue", {
       QueueName: queueName,
-      Attributes: {
-        FifoQueue: "true",
-        ContentBasedDeduplication: String(contentBasedDeduplication),
-        VisibilityTimeout: String(visibilityTimeout),
-        MessageRetentionPeriod: String(retentionPeriod),
-        DelaySeconds: String(delay)
-      },
+      Attributes: attributes,
       ...tags ? { tags } : {}
     });
     queueUrl = result.QueueUrl;
@@ -3990,12 +3976,7 @@ var ensureFifoQueue = (input) => Effect22.gen(function* () {
     queueUrl = existingUrl;
     yield* sqs_exports.make("set_queue_attributes", {
       QueueUrl: queueUrl,
-      Attributes: {
-        ContentBasedDeduplication: String(contentBasedDeduplication),
-        VisibilityTimeout: String(visibilityTimeout),
-        MessageRetentionPeriod: String(retentionPeriod),
-        DelaySeconds: String(delay)
-      }
+      Attributes: attributes
     });
     if (tags) {
       yield* sqs_exports.make("tag_queue", {
@@ -4014,6 +3995,44 @@ var ensureFifoQueue = (input) => Effect22.gen(function* () {
   }
   return { queueUrl, queueArn };
 });
+var ensureFifoQueue = (input) => Effect22.gen(function* () {
+  const {
+    name,
+    visibilityTimeout = 30,
+    retentionPeriod = 345600,
+    delay = 0,
+    contentBasedDeduplication = true,
+    maxReceiveCount = 3,
+    tags
+  } = input;
+  const dlqName = `${name}-dlq.fifo`;
+  const { queueUrl: dlqUrl, queueArn: dlqArn } = yield* ensureSingleFifoQueue({
+    queueName: dlqName,
+    attributes: {
+      FifoQueue: "true",
+      ContentBasedDeduplication: String(contentBasedDeduplication),
+      MessageRetentionPeriod: String(retentionPeriod)
+    },
+    tags
+  });
+  const queueName = `${name}.fifo`;
+  const { queueUrl, queueArn } = yield* ensureSingleFifoQueue({
+    queueName,
+    attributes: {
+      FifoQueue: "true",
+      ContentBasedDeduplication: String(contentBasedDeduplication),
+      VisibilityTimeout: String(visibilityTimeout),
+      MessageRetentionPeriod: String(retentionPeriod),
+      DelaySeconds: String(delay),
+      RedrivePolicy: JSON.stringify({
+        deadLetterTargetArn: dlqArn,
+        maxReceiveCount
+      })
+    },
+    tags
+  });
+  return { queueUrl, queueArn, dlqUrl, dlqArn };
+});
 var ensureSqsEventSourceMapping = (input) => Effect22.gen(function* () {
   const { functionArn, queueArn, batchSize = 10, batchWindow } = input;
   const existingMappings = yield* lambda_exports.make("list_event_source_mappings", {
@@ -4044,8 +4063,7 @@ var ensureSqsEventSourceMapping = (input) => Effect22.gen(function* () {
   });
   return result.UUID;
 });
-var deleteFifoQueue = (queueName) => Effect22.gen(function* () {
-  const name = queueName.endsWith(".fifo") ? queueName : `${queueName}.fifo`;
+var deleteSingleQueue = (name) => Effect22.gen(function* () {
   yield* Effect22.logDebug(`Deleting SQS queue: ${name}`);
   const urlResult = yield* sqs_exports.make("get_queue_url", {
     QueueName: name
@@ -4064,6 +4082,11 @@ var deleteFifoQueue = (queueName) => Effect22.gen(function* () {
     });
   }
 });
+var deleteFifoQueue = (queueName) => Effect22.gen(function* () {
+  const baseName = queueName.endsWith(".fifo") ? queueName.slice(0, -5) : queueName;
+  yield* deleteSingleQueue(`${baseName}.fifo`);
+  yield* deleteSingleQueue(`${baseName}-dlq.fifo`);
+});
 
 // src/aws/ses.ts
 import { Effect as Effect23 } from "effect";
@@ -4176,7 +4199,7 @@ var findDefineCalls = (sourceFile, defineFn) => {
   }
   return results;
 };
-var RUNTIME_PROPS = ["onRecord", "onBatchComplete", "onBatch", "onMessage", "onObjectCreated", "onObjectRemoved", "setup", "schema", "onError", "deps", "config", "static", "middleware", "auth", "routes", "get", "post"];
+var RUNTIME_PROPS = ["onRecord", "onBatchComplete", "onBatch", "onMessage", "onObjectCreated", "onObjectRemoved", "setup", "schema", "onError", "onAfterInvoke", "deps", "config", "static", "middleware", "auth", "routes", "get", "post"];
 var evalConfig = (configText, exportName) => {
   try {
     return new Function(`return ${configText}`)();
@@ -5738,12 +5761,13 @@ var deployFifoQueueFunction = ({ input, fn: fn13, layerArn, external, depsEnv, d
   yield* Effect32.logDebug("Creating SQS FIFO queue...");
   const queueName = `${input.project}-${tagCtx.stage}-${handlerName}`;
   const timeout = toSeconds4(config.lambda?.timeout ?? 30);
-  const { queueUrl, queueArn } = yield* ensureFifoQueue({
+  const { queueUrl, queueArn, dlqUrl, dlqArn } = yield* ensureFifoQueue({
     name: queueName,
     visibilityTimeout: Math.max(config.visibilityTimeout ? toSeconds4(config.visibilityTimeout) : timeout, timeout),
     retentionPeriod: config.retentionPeriod ? toSeconds4(config.retentionPeriod) : void 0,
     delay: config.delay ? toSeconds4(config.delay) : void 0,
     contentBasedDeduplication: config.contentBasedDeduplication ?? true,
+    maxReceiveCount: config.maxReceiveCount,
     tags: makeTags(tagCtx, "sqs")
   });
   const queueEnv = {
@@ -5780,7 +5804,9 @@ var deployFifoQueueFunction = ({ input, fn: fn13, layerArn, external, depsEnv, d
     status,
     bundleSize,
     queueUrl,
-    queueArn
+    queueArn,
+    dlqUrl,
+    dlqArn
   };
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effortless-aws/cli",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "license": "MIT",
   "type": "module",
   "description": "CLI and deploy tooling for effortless-aws",
@@ -39,7 +39,7 @@
     "esbuild": "^0.25.0",
     "glob": "^13.0.0",
     "ts-morph": "^27.0.2",
-    "effortless-aws": "0.25.0"
+    "effortless-aws": "0.27.0"
   },
   "devDependencies": {
     "@effect-ak/aws-sdk": "1.0.0-rc.3",