Improve helpers

kibertoad · kibertoad · commit f5fa0717dd63 · 2026-02-21T20:52:36.000+02:00
diff --git a/packages/s3-payload-store/package.json b/packages/s3-payload-store/package.json
@@ -41,7 +41,7 @@
         "@lokalise/tsconfig": "^3.0.0",
         "@types/node": "^25.0.2",
         "@vitest/coverage-v8": "^4.0.15",
-        "fauxqs": "^1.8.0",
+        "fauxqs": "^1.9.0",
         "rimraf": "^6.0.1",
         "typescript": "^5.9.3",
         "vitest": "^4.0.15"
diff --git a/packages/sns/package.json b/packages/sns/package.json
@@ -55,7 +55,7 @@
         "@vitest/coverage-v8": "^4.0.15",
         "awilix": "^12.1.1",
         "awilix-manager": "^6.1.0",
-        "fauxqs": "^1.8.0",
+        "fauxqs": "^1.9.0",
         "ioredis": "^5.7.0",
         "rimraf": "^6.0.1",
         "typescript": "^5.9.3",
diff --git a/packages/sns/test/consumers/CreateLocateConfigMixConsumer.spec.ts b/packages/sns/test/consumers/CreateLocateConfigMixConsumer.spec.ts
@@ -21,8 +21,7 @@ describe('CreateLocateConfigMixConsumer', () => {
   })
 
   beforeEach(async () => {
-    await testAdmin.deleteQueue(CreateLocateConfigMixConsumer.CONSUMED_QUEUE_NAME)
-    await testAdmin.deleteTopic(CreateLocateConfigMixConsumer.SUBSCRIBED_TOPIC_NAME)
+    await testAdmin.purge(CreateLocateConfigMixConsumer.CONSUMED_QUEUE_NAME)
   })
 
   it('accepts mixed config of create and locate', async () => {
diff --git a/packages/sns/test/consumers/SnsSqsPermissionConsumer.deadLetterQueue.spec.ts b/packages/sns/test/consumers/SnsSqsPermissionConsumer.deadLetterQueue.spec.ts
@@ -32,9 +32,7 @@ describe('SnsSqsPermissionConsumer - dead letter queue', () => {
   })
 
   beforeEach(async () => {
-    await testAdmin.deleteQueue(queueName)
-    await testAdmin.deleteQueue(deadLetterQueueName)
-    await testAdmin.deleteTopic(topicName)
+    await testAdmin.purge(queueName, deadLetterQueueName)
   })
 
   afterEach(async () => {
@@ -51,9 +49,7 @@ describe('SnsSqsPermissionConsumer - dead letter queue', () => {
     const deadLetterQueueName = 'deadLetterQueue'
 
     beforeEach(async () => {
-      await testAdmin.deleteQueue(queueName)
-      await testAdmin.deleteQueue(deadLetterQueueName)
-      await testAdmin.deleteTopic(topicName)
+      await testAdmin.purge(queueName, deadLetterQueueName)
     })
 
     it('creates a new dead letter queue', async () => {
diff --git a/packages/sns/test/consumers/SnsSqsPermissionConsumer.fifo.spec.ts b/packages/sns/test/consumers/SnsSqsPermissionConsumer.fifo.spec.ts
@@ -24,7 +24,7 @@ describe('SnsSqsPermissionConsumerFifo', () => {
     })
 
     afterEach(async () => {
-      await testAdmin.deleteTopic(topicName)
+      await testAdmin.purge()
       const { awilixManager } = diContainer.cradle
       await awilixManager.executeDispose()
       await diContainer.dispose()
diff --git a/packages/sns/test/consumers/SnsSqsPermissionConsumer.payloadOffloading.spec.ts b/packages/sns/test/consumers/SnsSqsPermissionConsumer.payloadOffloading.spec.ts
@@ -48,8 +48,7 @@ describe('SnsSqsPermissionConsumer - single-store payload offloading', () => {
         payloadStoreConfig,
       })
 
-      await testAdmin.deleteQueue(SnsSqsPermissionConsumer.CONSUMED_QUEUE_NAME)
-      await testAdmin.deleteTopic(SnsSqsPermissionConsumer.CONSUMED_QUEUE_NAME)
+      await testAdmin.purge(SnsSqsPermissionConsumer.CONSUMED_QUEUE_NAME)
 
       await consumer.start()
       await publisher.init()
diff --git a/packages/sns/test/consumers/SnsSqsPermissionConsumer.spec.ts b/packages/sns/test/consumers/SnsSqsPermissionConsumer.spec.ts
@@ -35,8 +35,7 @@ describe('SnsSqsPermissionConsumer', () => {
       testAdmin = diContainer.cradle.testAdmin
     })
     beforeEach(async () => {
-      await testAdmin.deleteQueue(queueName)
-      await testAdmin.deleteTopic(topicNome)
+      await testAdmin.purge(queueName)
     })
 
     // FixMe https://github.com/localstack/localstack/issues/9306
@@ -791,8 +790,7 @@ describe('SnsSqsPermissionConsumer', () => {
     })
 
     beforeEach(async () => {
-      await diContainer.cradle.testAdmin.deleteQueue(queueName)
-      await diContainer.cradle.testAdmin.deleteTopic(topicName)
+      await diContainer.cradle.testAdmin.purge(queueName)
     })
 
     afterAll(async () => {
@@ -873,8 +871,7 @@ describe('SnsSqsPermissionConsumer', () => {
     })
 
     beforeEach(async () => {
-      await diContainer.cradle.testAdmin.deleteQueue(queueName)
-      await diContainer.cradle.testAdmin.deleteTopic(topicName)
+      await diContainer.cradle.testAdmin.purge(queueName)
     })
 
     afterAll(async () => {
diff --git a/packages/sns/test/consumers/SnsSqsPermissionConsumer.startupResourcePolling.spec.ts b/packages/sns/test/consumers/SnsSqsPermissionConsumer.startupResourcePolling.spec.ts
@@ -81,13 +81,11 @@ describe('SnsSqsPermissionConsumer - startupResourcePollingConfig', () => {
   })
 
   beforeEach(async () => {
-    await testAdmin.deleteQueue(queueName)
-    await testAdmin.deleteTopic(topicName)
+    await testAdmin.purge(queueName)
   })
 
   afterEach(async () => {
-    await testAdmin.deleteQueue(queueName)
-    await testAdmin.deleteTopic(topicName)
+    await testAdmin.purge(queueName)
   })
 
   afterAll(async () => {
diff --git a/packages/sns/test/publishers/SnsPermissionPublisher.fifo.spec.ts b/packages/sns/test/publishers/SnsPermissionPublisher.fifo.spec.ts
@@ -48,11 +48,11 @@ describe('SnsPermissionPublisherFifo', () => {
       diContainer = await registerDependencies()
       snsClient = diContainer.cradle.snsClient
       testAdmin = diContainer.cradle.testAdmin
-      await testAdmin.deleteTopic(topicName)
+      await testAdmin.purge()
     })
 
     afterEach(async () => {
-      await testAdmin.deleteTopic(topicName)
+      await testAdmin.purge()
       await diContainer.cradle.awilixManager.executeDispose()
       await diContainer.dispose()
     })
diff --git a/packages/sns/test/publishers/SnsPermissionPublisher.multiStorePayloadOffloading.spec.ts b/packages/sns/test/publishers/SnsPermissionPublisher.multiStorePayloadOffloading.spec.ts
@@ -58,8 +58,7 @@ describe('SnsPermissionPublisher - multi-store payload offloading', () => {
     })
 
     beforeEach(async () => {
-      await testAdmin.deleteQueue(queueName)
-      await testAdmin.deleteTopic(SnsPermissionPublisher.TOPIC_NAME)
+      await testAdmin.purge(queueName)
       const { queueUrl } = await assertQueue(sqsClient, { QueueName: queueName })
       await subscribeToTopic(
         sqsClient,
diff --git a/packages/sns/test/publishers/SnsPermissionPublisher.payloadOffloading.spec.ts b/packages/sns/test/publishers/SnsPermissionPublisher.payloadOffloading.spec.ts
@@ -63,8 +63,7 @@ describe('SnsPermissionPublisher - single-store payload offloading', () => {
     })
 
     beforeEach(async () => {
-      await testAdmin.deleteQueue(queueName)
-      await testAdmin.deleteTopic(SnsPermissionPublisher.TOPIC_NAME)
+      await testAdmin.purge(queueName)
       const { queueUrl } = await assertQueue(sqsClient, {
         QueueName: queueName,
       })
diff --git a/packages/sns/test/publishers/SnsPermissionPublisher.spec.ts b/packages/sns/test/publishers/SnsPermissionPublisher.spec.ts
@@ -38,7 +38,7 @@ describe('SnsPermissionPublisher', () => {
     })
 
     beforeEach(async () => {
-      await testAdmin.deleteTopic(topicNome)
+      await testAdmin.purge()
     })
 
     it('sets correct policy when policy fields are set', async () => {
@@ -197,8 +197,7 @@ describe('SnsPermissionPublisher', () => {
       testAdmin = diContainer.cradle.testAdmin
       await diContainer.cradle.permissionConsumer.close()
 
-      await testAdmin.deleteQueue(queueName)
-      await testAdmin.deleteTopic(SnsPermissionPublisher.TOPIC_NAME)
+      await testAdmin.purge(queueName)
     })
 
     afterEach(async () => {
diff --git a/packages/sns/test/utils/snsSubscriber.spec.ts b/packages/sns/test/utils/snsSubscriber.spec.ts
@@ -36,8 +36,7 @@ describe('snsSubscriber', () => {
     await awilixManager.executeDispose()
     await diContainer.dispose()
 
-    await testAdmin.deleteTopic(TOPIC_NAME)
-    await testAdmin.deleteQueue(QUEUE_NAME)
+    await testAdmin.purge(QUEUE_NAME)
   })
 
   describe('subscribeToTopic', () => {
diff --git a/packages/sns/test/utils/testAdmin.ts b/packages/sns/test/utils/testAdmin.ts
@@ -4,7 +4,7 @@ import type { SQSClient } from '@aws-sdk/client-sqs'
 import type { STSClient } from '@aws-sdk/client-sts'
 import { deleteQueue } from '@message-queue-toolkit/sqs'
 import type { FauxqsServer } from 'fauxqs'
-import { deleteTopic } from '../../lib/utils/snsUtils.ts'
+
 import { assertBucket, emptyBucket } from './s3Utils.ts'
 
 export class TestAwsResourceAdmin {
@@ -28,34 +28,32 @@ export class TestAwsResourceAdmin {
     this.stsClient = opts.stsClient
   }
 
-  async deleteQueue(name: string) {
-    return await deleteQueue(this.sqsClient, name)
-  }
-
-  async deleteTopic(name: string) {
-    return await deleteTopic(this.snsClient, this.stsClient, name)
+  async purge(...queueNames: string[]) {
+    if (this.server) {
+      this.server.reset()
+      for (const name of queueNames) {
+        this.server.deleteQueue(name)
+      }
+      return
+    }
+    for (const name of queueNames) {
+      await deleteQueue(this.sqsClient, name)
+    }
   }
 
   async createBucket(name: string) {
-    // if (this.server) {
-    //   this.server.createBucket(name)
-    //   return
-    // }
+    if (this.server) {
+      this.server.createBucket(name)
+      return
+    }
     return await assertBucket(this.s3!, name)
   }
 
   async emptyBucket(name: string) {
+    if (this.server) {
+      this.server.emptyBucket(name)
+      return
+    }
     return await emptyBucket(this.s3!, name)
   }
-
-  reset() {
-    // if (this.server) {
-    //   this.server.reset()
-    // }
-  }
-
-  inspectQueue(name: string) {
-    // return this.server?.inspectQueue(name)
-    return undefined
-  }
 }
diff --git a/packages/sqs/package.json b/packages/sqs/package.json
@@ -50,7 +50,7 @@
         "@vitest/coverage-v8": "^4.0.15",
         "awilix": "^12.0.5",
         "awilix-manager": "^6.1.0",
-        "fauxqs": "^1.8.0",
+        "fauxqs": "^1.9.0",
         "ioredis": "^5.6.1",
         "rimraf": "^6.0.1",
         "typescript": "^5.9.3",
diff --git a/packages/sqs/test/consumers/SqsEventBridgeConsumer.spec.ts b/packages/sqs/test/consumers/SqsEventBridgeConsumer.spec.ts
@@ -38,7 +38,7 @@ describe('SqsEventBridgeConsumer', () => {
 
   afterEach(async () => {
     await consumer.close()
-    await testAdmin.deleteQueue(SqsEventBridgeConsumer.QUEUE_NAME)
+    await testAdmin.purge(SqsEventBridgeConsumer.QUEUE_NAME)
     await diContainer.cradle.awilixManager.executeDispose()
     await diContainer.dispose()
   })
@@ -255,7 +255,7 @@ describe('SqsEventBridgeConsumer', () => {
 
     // Cleanup
     await failingConsumer.close()
-    await testAdmin.deleteQueue(failingConsumer.queueProps.name)
+    await testAdmin.purge(failingConsumer.queueProps.name)
   }, 10000) // 10 second timeout
 
   it('should handle multiple EventBridge events', async () => {
diff --git a/packages/sqs/test/consumers/SqsPermissionConsumer.multiStorePayloadOffloading.spec.ts b/packages/sqs/test/consumers/SqsPermissionConsumer.multiStorePayloadOffloading.spec.ts
@@ -46,7 +46,7 @@ describe('SqsPermissionConsumer - multi-store payload offloading', () => {
       await testAdmin.createBucket(s3BucketNameStore2)
     })
     beforeEach(async () => {
-      await testAdmin.deleteQueue(SqsPermissionConsumer.QUEUE_NAME)
+      await testAdmin.purge(SqsPermissionConsumer.QUEUE_NAME)
     })
     afterEach(async () => {
       await publisher?.close()
@@ -220,7 +220,7 @@ describe('SqsPermissionConsumer - multi-store payload offloading', () => {
       const TEST_QUEUE_NAME = 'user_permissions_legacy_default_store_test'
       const { sqsClient } = diContainer.cradle
 
-      await testAdmin.deleteQueue(TEST_QUEUE_NAME)
+      await testAdmin.purge(TEST_QUEUE_NAME)
       const { queueUrl } = await assertQueue(sqsClient, { QueueName: TEST_QUEUE_NAME })
 
       const store1 = new S3PayloadStore(diContainer.cradle, { bucketName: s3BucketNameStore1 })
@@ -296,7 +296,7 @@ describe('SqsPermissionConsumer - multi-store payload offloading', () => {
       const TEST_QUEUE_NAME = 'user_permissions_multi_store_no_default_test'
       const { sqsClient } = diContainer.cradle
 
-      await testAdmin.deleteQueue(TEST_QUEUE_NAME)
+      await testAdmin.purge(TEST_QUEUE_NAME)
       const { queueUrl } = await assertQueue(sqsClient, { QueueName: TEST_QUEUE_NAME })
 
       const store1 = new S3PayloadStore(diContainer.cradle, { bucketName: s3BucketNameStore1 })
diff --git a/packages/sqs/test/consumers/SqsPermissionConsumer.payloadOffloading.spec.ts b/packages/sqs/test/consumers/SqsPermissionConsumer.payloadOffloading.spec.ts
@@ -50,7 +50,7 @@ describe('SqsPermissionConsumer - single-store payload offloading', () => {
       }
     })
     beforeEach(async () => {
-      await testAdmin.deleteQueue(SqsPermissionConsumer.QUEUE_NAME)
+      await testAdmin.purge(SqsPermissionConsumer.QUEUE_NAME)
 
       consumer = new SqsPermissionConsumer(diContainer.cradle, {
         payloadStoreConfig,
@@ -101,7 +101,7 @@ describe('SqsPermissionConsumer - single-store payload offloading', () => {
       const TEST_QUEUE_NAME = 'user_permissions_offloading_error_test'
 
       // Clean up any existing test queue
-      await testAdmin.deleteQueue(TEST_QUEUE_NAME)
+      await testAdmin.purge(TEST_QUEUE_NAME)
 
       // Create dedicated publisher with isolated queue
       const testPublisher = new SqsPermissionPublisher(diContainer.cradle, {
@@ -193,7 +193,7 @@ describe('SqsPermissionConsumer - single-store payload offloading', () => {
       const TEST_QUEUE_NAME = 'user_permissions_legacy_format_test'
       const { sqsClient } = diContainer.cradle
 
-      await testAdmin.deleteQueue(TEST_QUEUE_NAME)
+      await testAdmin.purge(TEST_QUEUE_NAME)
       const { queueUrl } = await assertQueue(sqsClient, { QueueName: TEST_QUEUE_NAME })
 
       // Manually create a payload in S3 (simulating what an old publisher would do)
@@ -287,7 +287,7 @@ describe('SqsPermissionConsumer - nested messageTypePath with payload offloading
     })
 
     it('preserves nested messageTypePath when offloading payload', async () => {
-      await testAdmin.deleteQueue(TEST_QUEUE_NAME)
+      await testAdmin.purge(TEST_QUEUE_NAME)
 
       const payloadStoreConfig: SinglePayloadStoreConfig = {
         messageSizeThreshold: largeMessageSizeThreshold,
diff --git a/packages/sqs/test/consumers/SqsPermissionConsumer.spec.ts b/packages/sqs/test/consumers/SqsPermissionConsumer.spec.ts
@@ -40,7 +40,7 @@ describe('SqsPermissionConsumer', () => {
       diContainer = await registerDependencies()
       sqsClient = diContainer.cradle.sqsClient
       testAdmin = diContainer.cradle.testAdmin
-      await testAdmin.deleteQueue(queueName)
+      await testAdmin.purge(queueName)
     })
 
     afterEach(async () => {
diff --git a/packages/sqs/test/consumers/SqsPermissionConsumer.startupResourcePolling.spec.ts b/packages/sqs/test/consumers/SqsPermissionConsumer.startupResourcePolling.spec.ts
@@ -67,11 +67,11 @@ describe('SqsPermissionConsumer - startupResourcePollingConfig', () => {
     diContainer = await registerDependencies()
     sqsClient = diContainer.cradle.sqsClient
     testAdmin = diContainer.cradle.testAdmin
-    await testAdmin.deleteQueue(queueName)
+    await testAdmin.purge(queueName)
   })
 
   afterEach(async () => {
-    await testAdmin.deleteQueue(queueName)
+    await testAdmin.purge(queueName)
     await diContainer.cradle.awilixManager.executeDispose()
     await diContainer.dispose()
   })
diff --git a/packages/sqs/test/consumers/SqsPermisssionConsumer.deadLetterQueue.spec.ts b/packages/sqs/test/consumers/SqsPermisssionConsumer.deadLetterQueue.spec.ts
@@ -41,8 +41,7 @@ describe('SqsPermissionConsumer - deadLetterQueue', () => {
   })
 
   beforeEach(async () => {
-    await testAdmin.deleteQueue(queueName)
-    await testAdmin.deleteQueue(deadLetterQueueName)
+    await testAdmin.purge(queueName, deadLetterQueueName)
   })
 
   afterEach(async () => {
@@ -62,8 +61,7 @@ describe('SqsPermissionConsumer - deadLetterQueue', () => {
     const customDeadLetterQueueName = 'customDlq'
 
     beforeEach(async () => {
-      await testAdmin.deleteQueue(customQueueName)
-      await testAdmin.deleteQueue(customDeadLetterQueueName)
+      await testAdmin.purge(customQueueName, customDeadLetterQueueName)
     })
 
     describe('creating new dead letter queue', () => {
diff --git a/packages/sqs/test/publishers/SqsPermissionPublisher.fifo.spec.ts b/packages/sqs/test/publishers/SqsPermissionPublisher.fifo.spec.ts
@@ -48,11 +48,11 @@ describe('SqsPermissionPublisherFifo', () => {
       diContainer = await registerDependencies()
       sqsClient = diContainer.cradle.sqsClient
       testAdmin = diContainer.cradle.testAdmin
-      await testAdmin.deleteQueue(queueName)
+      await testAdmin.purge(queueName)
     })
 
     afterEach(async () => {
-      await testAdmin.deleteQueue(queueName)
+      await testAdmin.purge(queueName)
       await diContainer.cradle.awilixManager.executeDispose()
       await diContainer.dispose()
     })
diff --git a/packages/sqs/test/publishers/SqsPermissionPublisher.multiStorePayloadOffloading.spec.ts b/packages/sqs/test/publishers/SqsPermissionPublisher.multiStorePayloadOffloading.spec.ts
@@ -49,7 +49,7 @@ describe('SqsPermissionPublisher - multi-store payload offloading', () => {
       await testAdmin.createBucket(s3BucketNameStore2)
     })
     beforeEach(async () => {
-      await testAdmin.deleteQueue(queueName)
+      await testAdmin.purge(queueName)
       const { queueUrl } = await assertQueue(sqsClient, { QueueName: queueName })
 
       receivedSqsMessages = []
diff --git a/packages/sqs/test/publishers/SqsPermissionPublisher.payloadOffloading.spec.ts b/packages/sqs/test/publishers/SqsPermissionPublisher.payloadOffloading.spec.ts
diff --git a/packages/sqs/test/publishers/SqsPermissionPublisher.spec.ts b/packages/sqs/test/publishers/SqsPermissionPublisher.spec.ts
diff --git a/packages/sqs/test/utils/testAdmin.ts b/packages/sqs/test/utils/testAdmin.ts
