Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

Fix[Eventbridge pipe - SQS] Eventbridge pipe always delivers sqs message to default region (#714)

Arthur Tristram254990c0893f
diff --git a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvoker.java b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvoker.java
index 3070c8bdd6..5ed57b5c1f 100644
--- a/src/main/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvoker.java
+++ b/src/main/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvoker.java
@@ -65,7 +65,7 @@ public class PipesTargetInvoker {
if (targetArn.contains(":lambda:") || targetArn.contains(":function:")) {
invokeLambda(targetArn, payload, region);
} else if (targetArn.contains(":sqs:")) {
- invokeSqs(targetArn, payload);
+ invokeSqs(targetArn, payload, region);
} else if (targetArn.contains(":sns:")) {
invokeSns(targetArn, payload, region);
} else if (targetArn.contains(":events:")) {
@@ -90,6 +90,12 @@ public class PipesTargetInvoker {
LOG.debugv("Pipe delivered to SQS: {0}", arn);
}
+ private void invokeSqs(String arn, String payload, String region) {
+ String queueUrl = AwsArnUtils.arnToQueueUrl(arn, baseUrl);
+ sqsService.sendMessage(queueUrl, payload, 0, region);
+ LOG.debugv("Pipe delivered to SQS: {0}", arn);
+ }
+
private void invokeSns(String arn, String payload, String region) {
String topicRegion = extractRegionFromArn(arn, region);
snsService.publish(arn, null, payload, "Pipes", topicRegion);
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.java
index 04f0184e10..0682b683fb 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
@@ -309,6 +309,10 @@ public class SqsService {
return sendMessage(queueUrl, body, delaySeconds, null, null);
}
+ public Message sendMessage(String queueUrl, String body, int delaySeconds, String region) {
+ return sendMessage(queueUrl, body, delaySeconds, null, null, region);
+ }
+
public Message sendMessage(String queueUrl, String body, int delaySeconds,
String messageGroupId, String messageDeduplicationId) {
return sendMessage(queueUrl, body, delaySeconds, messageGroupId, messageDeduplicationId, null,
diff --git a/src/test/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvokerTest.java b/src/test/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvokerTest.java
index 4070c7adef..20040d4252 100644
--- a/src/test/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvokerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/pipes/PipesTargetInvokerTest.java
@@ -59,43 +59,47 @@ class PipesTargetInvokerTest {
@Test
void inputTemplate_replacesPlaceholders() {
+ String region = "us-east-1";
ObjectNode tp = MAPPER.createObjectNode();
tp.put("InputTemplate", "{\"id\": <$.messageId>, \"content\": <$.body>}");
- Pipe pipe = createPipe("arn:aws:sqs:us-east-1:000000000000:target", tp);
+ Pipe pipe = createPipe("arn:aws:sqs:" + region + ":000000000000:target", tp);
String payload = "{\"messageId\": \"msg-123\", \"body\": \"hello world\"}";
- invoker.invoke(pipe, payload, "us-east-1");
+ invoker.invoke(pipe, payload, region);
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
- verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0));
+ verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0), eq(region));
String sent = captor.getValue();
assertEquals("{\"id\": \"msg-123\", \"content\": \"hello world\"}", sent);
}
@Test
void inputTemplate_missingFieldReplacesWithEmpty() {
+ String region = "us-east-1";
ObjectNode tp = MAPPER.createObjectNode();
tp.put("InputTemplate", "{\"id\": \"<$.nonexistent>\"}");
- Pipe pipe = createPipe("arn:aws:sqs:us-east-1:000000000000:target", tp);
+ Pipe pipe = createPipe("arn:aws:sqs:" + region + ":000000000000:target", tp);
String payload = "{\"messageId\": \"msg-123\"}";
- invoker.invoke(pipe, payload, "us-east-1");
+ invoker.invoke(pipe, payload, region);
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
- verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0));
+ verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0), eq(region));
assertEquals("{\"id\": \"\"}", captor.getValue());
}
@Test
void noInputTemplate_passesPayloadUnchanged() {
- Pipe pipe = createPipe("arn:aws:sqs:us-east-1:000000000000:target", null);
+ String region = "us-east-1";
+
+ Pipe pipe = createPipe("arn:aws:sqs:" + region + ":000000000000:target", null);
String payload = "{\"Records\": []}";
- invoker.invoke(pipe, payload, "us-east-1");
+ invoker.invoke(pipe, payload, region);
- verify(sqsService).sendMessage(anyString(), eq(payload), eq(0));
+ verify(sqsService).sendMessage(anyString(), eq(payload), eq(0), eq(region));
}
@Test
@@ -110,16 +114,17 @@ class PipesTargetInvokerTest {
@Test
void inputTemplate_objectValuePreservedAsJson() {
+ String region = "us-east-1";
ObjectNode tp = MAPPER.createObjectNode();
tp.put("InputTemplate", "{\"data\": <$.nested>}");
- Pipe pipe = createPipe("arn:aws:sqs:us-east-1:000000000000:target", tp);
+ Pipe pipe = createPipe("arn:aws:sqs:" + region + ":000000000000:target", tp);
String payload = "{\"nested\": {\"key\": \"value\"}}";
- invoker.invoke(pipe, payload, "us-east-1");
+ invoker.invoke(pipe, payload, region);
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
- verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0));
+ verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0), eq(region));
assertEquals("{\"data\": {\"key\":\"value\"}}", captor.getValue());
}
@@ -227,6 +232,7 @@ class PipesTargetInvokerTest {
@Test
void inputTemplate_nestedJsonString_endToEnd() {
+ String region = "us-east-1";
ObjectNode tp = MAPPER.createObjectNode();
tp.put("InputTemplate",
"{\"message\": <$.body.message>, \"messageType\": <$.body.messageType>}");
@@ -234,10 +240,10 @@ class PipesTargetInvokerTest {
Pipe pipe = createPipe("arn:aws:sqs:us-east-1:000000000000:target", tp);
String payload = "{\"body\": \"{\\\"message\\\": \\\"user registered\\\", \\\"messageType\\\": \\\"REGISTRATION\\\"}\"}";
- invoker.invoke(pipe, payload, "us-east-1");
+ invoker.invoke(pipe, payload, region);
ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
- verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0));
+ verify(sqsService).sendMessage(anyString(), captor.capture(), eq(0), eq(region));
assertEquals(
"{\"message\": \"user registered\", \"messageType\": \"REGISTRATION\"}",
captor.getValue());