Light, fluffy, and always free - The AWS Local Emulator alternative
feat(sqs): retain MessageGroupId on standard queue messages (#1891)
soreavisa01b707bdc67
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 6f6373d708..9d06cce3ed 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,8 +479,10 @@ public class SqsService implements Resettable {return message;}- // Standard queue+ // Standard queue. MessageGroupId is retained for ReceiveMessage to+ // return (fair queues); it has no effect on standard-queue delivery.Message message = new Message(body);+ message.setMessageGroupId(messageGroupId);message.setAwsTraceHeader(awsTraceHeader);if (effectiveDelaySeconds > 0) {message.setVisibleAt(Instant.now().plusSeconds(effectiveDelaySeconds));diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.javaindex 9e0ac5258d..fc1c1d2254 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsJsonProtocolTest.java@@ -358,6 +358,36 @@ class SqsJsonProtocolTest {.body("Messages[0].Attributes.ApproximateFirstReceiveTimestamp", notNullValue());}+ @Test+ @Order(9)+ void sendMessageToStandardQueueRetainsMessageGroupId() {+ String groupQueueName = QUEUE_NAME + "-group";+ String groupQueueUrl = given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "AmazonSQS.CreateQueue")+ .body("{\"QueueName\":\"" + groupQueueName + "\"}")+ .when().post("/").then().statusCode(200)+ .extract().jsonPath().getString("QueueUrl");++ given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "AmazonSQS.SendMessage")+ .body("{\"QueueUrl\":\"" + groupQueueUrl + "\","+ + "\"MessageBody\":\"fair-queues message\","+ + "\"MessageGroupId\":\"tenant-1\"}")+ .when().post("/").then().statusCode(200);++ given()+ .contentType(CONTENT_TYPE)+ .header("X-Amz-Target", "AmazonSQS.ReceiveMessage")+ .body("{\"QueueUrl\":\"" + groupQueueUrl + "\","+ + "\"MaxNumberOfMessages\":1,"+ + "\"VisibilityTimeout\":0,"+ + "\"MessageSystemAttributeNames\":[\"MessageGroupId\"]}")+ .when().post("/").then().statusCode(200)+ .body("Messages[0].Attributes.MessageGroupId", equalTo("tenant-1"));+ }+@Test@Order(7)void tagQueueWithJsonNullValueIsRejected() {