Light, fluffy, and always free - The AWS Local Emulator alternative
fix(sns) Allow to publish SMS using phone-number (#138)
Masatoshi Tada788cf01d2c66
diff --git a/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.javaindex 21df734b1b..508f18b52f 100644--- a/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/sns/SnsJsonHandler.java@@ -150,6 +150,7 @@ public class SnsJsonHandler {private Response handlePublish(JsonNode request, String region) {String topicArn = request.path("TopicArn").asText(null);String targetArn = request.path("TargetArn").asText(null);+ String phoneNumber = request.path("PhoneNumber").asText(null);String message = request.path("Message").asText(null);String subject = request.path("Subject").asText(null);@@ -161,7 +162,7 @@ public class SnsJsonHandler {});}- String messageId = snsService.publish(topicArn, targetArn, message, subject, attributes, region);+ String messageId = snsService.publish(topicArn, targetArn, phoneNumber, message, subject, attributes, region);ObjectNode response = objectMapper.createObjectNode();response.put("MessageId", messageId);return Response.ok(response).build();diff --git a/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.javaindex 086b63708e..39ffaef05e 100644--- a/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/sns/SnsQueryHandler.java@@ -175,6 +175,7 @@ public class SnsQueryHandler {private Response handlePublish(MultivaluedMap<String, String> params, String region) {String topicArn = getParam(params, "TopicArn");String targetArn = getParam(params, "TargetArn");+ String phoneNumber = getParam(params, "PhoneNumber");String message = getParam(params, "Message");String subject = getParam(params, "Subject");String messageGroupId = getParam(params, "MessageGroupId");@@ -189,7 +190,7 @@ public class SnsQueryHandler {}try {- String messageId = snsService.publish(topicArn, targetArn, message, subject,+ String messageId = snsService.publish(topicArn, targetArn, phoneNumber, message, subject,attributes, messageGroupId, messageDeduplicationId, region);String result = new XmlBuilder().elem("MessageId", messageId).build();diff --git a/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.java b/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.javaindex 8499c79fbf..9e0b6c4370 100644--- a/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/sns/SnsService.java@@ -238,19 +238,26 @@ public class SnsService {return subscriptionsByTopic(topicArn, region);}+ // Since this method is called by S3 and EventBridge, this doesn't need "phoneNumber" parameter.public String publish(String topicArn, String targetArn, String message,String subject, String region) {- return publish(topicArn, targetArn, message, subject, null, null, null, region);+ return publish(topicArn, targetArn, null, message, subject, null, null, null, region);}- public String publish(String topicArn, String targetArn, String message,+ public String publish(String topicArn, String targetArn, String phoneNumber, String message,String subject, Map<String, String> messageAttributes, String region) {- return publish(topicArn, targetArn, message, subject, messageAttributes, null, null, region);+ return publish(topicArn, targetArn, phoneNumber, message, subject, messageAttributes, null, null, region);}- public String publish(String topicArn, String targetArn, String message,+ public String publish(String topicArn, String targetArn, String phoneNumber, String message,String subject, Map<String, String> messageAttributes,String messageGroupId, String messageDeduplicationId, String region) {+ // Send SMS+ if (phoneNumber != null) {+ return UUID.randomUUID().toString();+ }++ // Send a message to topic or directly to a target ARNString effectiveArn = topicArn != null ? topicArn : targetArn;if (effectiveArn == null) {throw new AwsException("InvalidParameter", "TopicArn or TargetArn is required.", 400);diff --git a/src/test/java/io/github/hectorvent/floci/services/sns/SnsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/sns/SnsServiceTest.javaindex 79d7932e50..fcf5cbad60 100644--- a/src/test/java/io/github/hectorvent/floci/services/sns/SnsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sns/SnsServiceTest.java@@ -153,6 +153,12 @@ class SnsServiceTest {assertNotNull(messageId);}+ @Test+ void publish_withPhoneNumber_returnsMessageId() {+ String messageId = snsService.publish(null, null, "+819012345678", "Hello phone!", null, null, REGION);+ assertNotNull(messageId);+ }+@Testvoid publish_requiresTopicArn() {assertThrows(AwsException.class,