Light, fluffy, and always free - The AWS Local Emulator alternative
fix(sqs): use queue-level VisibilityTimeout as fallback in ReceiveMessage (#413)
Mikołaj Kłosowskidb21bc9ec67f
diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.javaindex 79cb4ab829..149ceadafb 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/SqsService.java@@ -479,7 +479,13 @@ public class SqsService {return Collections.emptyList();}- int effectiveTimeout = visibilityTimeout >= 0 ? visibilityTimeout : defaultVisibilityTimeout;+ int effectiveTimeout;+ if (visibilityTimeout >= 0) {+ effectiveTimeout = visibilityTimeout;+ } else {+ String queueVt = queue.getAttributes().get("VisibilityTimeout");+ effectiveTimeout = queueVt != null ? Integer.parseInt(queueVt) : defaultVisibilityTimeout;+ }RedrivePolicy rp = getOrParseRedrivePolicy(queue, storageKey);int maxReceiveCount = rp != null ? rp.maxReceiveCount() : -1;diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.javaindex dea1a8266c..fbc7cde855 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java@@ -288,4 +288,27 @@ class SqsServiceTest {assertThrows(AwsException.class, () ->sqsService.sendMessage(queue.getQueueUrl(), "msg", 0, "group1", null));}++ @Test+ void receiveMessageUsesQueueVisibilityTimeoutWhenNotSpecified() {+ // Create queue with a short visibility timeout (1 second)+ Queue queue = sqsService.createQueue("short-vt-queue",+ Map.of("VisibilityTimeout", "1"));+ sqsService.sendMessage(queue.getQueueUrl(), "test-msg", 0);++ // Receive without specifying visibility timeout (-1 means "use queue default")+ List<Message> first = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0);+ assertEquals(1, first.size());++ // Message should be invisible immediately after receive+ List<Message> second = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0);+ assertTrue(second.isEmpty());++ // Wait for the queue's visibility timeout (1s) to expire, not the global default (30s)+ try { Thread.sleep(1100); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }++ // Message should now be visible again+ List<Message> third = sqsService.receiveMessage(queue.getQueueUrl(), 1, -1, 0);+ assertEquals(1, third.size(), "Message should become visible after queue's VisibilityTimeout (1s), not global default (30s)");+ }}