Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Envelope sns message when sending to sqs (#1066)

Browse Source 
* envelop message when sendig from sns to sqs

* add test for publishing sns message to sqs

* specify separators options to json.dumps to avoid json bug in python2

* remove unused print

* replace time string for testing server mode
This commit is contained in:
Toshiya Kawasaki 2017-08-22 04:29:34 +09:00 committed by Jack Danger
parent b6cc208534
commit ce7eabd44a
3 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/sns/models.py
View File

@ -81,8 +81,8 @@ class Subscription(BaseModel):
if self.protocol == 'sqs':
queue_name = self.endpoint.split(":")[-1]
region = self.endpoint.split(":")[3]
escaped_message = message.replace('"', '\\"')
sqs_backends[region].send_message(queue_name, escaped_message)
enveloped_message = json.dumps(self.get_post_data(message, message_id), sort_keys=True, indent=2, separators=(',', ': '))
sqs_backends[region].send_message(queue_name, enveloped_message)
elif self.protocol in ['http', 'https']:
post_data = self.get_post_data(message, message_id)
requests.post(self.endpoint, json=post_data)

23
tests/test_sns/test_publishing.py
View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
from six.moves.urllib.parse import parse_qs
import boto
import re
from freezegun import freeze_time
import sure # noqa
@ -9,6 +10,9 @@ from moto.packages.responses import responses
from moto import mock_sns_deprecated, mock_sqs_deprecated
MESSAGE_FROM_SQS_TEMPLATE = '{\n "Message": "%s",\n "MessageId": "%s",\n "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n "SignatureVersion": "1",\n "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n "Subject": "my subject",\n "Timestamp": "2015-01-01T12:00:00.000Z",\n "TopicArn": "arn:aws:sns:%s:123456789012:some-topic",\n "Type": "Notification",\n "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:123456789012:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}'
@mock_sqs_deprecated
@mock_sns_deprecated
def test_publish_to_sqs():
@ -24,11 +28,16 @@ def test_publish_to_sqs():
conn.subscribe(topic_arn, "sqs",
"arn:aws:sqs:us-east-1:123456789012:test-queue")
conn.publish(topic=topic_arn, message="my message")
message_to_publish = 'my message'
with freeze_time("2015-01-01 12:00:00"):
published_message = conn.publish(topic=topic_arn, message=message_to_publish)
published_message_id = published_message['PublishResponse']['PublishResult']['MessageId']
queue = sqs_conn.get_queue("test-queue")
message = queue.read(1)
message.get_body().should.equal('my message')
expected = MESSAGE_FROM_SQS_TEMPLATE % (message_to_publish, published_message_id, 'us-east-1')
acquired_message = re.sub("\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z", '2015-01-01T12:00:00.000Z', message.get_body())
acquired_message.should.equal(expected)
@mock_sqs_deprecated
@ -46,8 +55,14 @@ def test_publish_to_sqs_in_different_region():
conn.subscribe(topic_arn, "sqs",
"arn:aws:sqs:us-west-2:123456789012:test-queue")
conn.publish(topic=topic_arn, message="my message")
message_to_publish = 'my message'
with freeze_time("2015-01-01 12:00:00"):
published_message = conn.publish(topic=topic_arn, message=message_to_publish)
published_message_id = published_message['PublishResponse']['PublishResult']['MessageId']
queue = sqs_conn.get_queue("test-queue")
message = queue.read(1)
message.get_body().should.equal('my message')
expected = MESSAGE_FROM_SQS_TEMPLATE % (message_to_publish, published_message_id, 'us-west-1')
acquired_message = re.sub("\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z", '2015-01-01T12:00:00.000Z', message.get_body())
acquired_message.should.equal(expected)

38
tests/test_sns/test_publishing_boto3.py
View File

@ -5,13 +5,20 @@ import json
from six.moves.urllib.parse import parse_qs
import boto3
import re
from freezegun import freeze_time
import sure # noqa
from moto.packages.responses import responses
from moto import mock_sns, mock_sqs
from freezegun import freeze_time
MESSAGE_FROM_SQS_TEMPLATE = '{\n "Message": "%s",\n "MessageId": "%s",\n "Signature": "EXAMPLElDMXvB8r9R83tGoNn0ecwd5UjllzsvSvbItzfaMpN2nk5HVSw7XnOn/49IkxDKz8YrlH2qJXj2iZB0Zo2O71c4qQk1fMUDi3LGpij7RCW7AW9vYYsSqIKRnFS94ilu7NFhUzLiieYr4BKHpdTmdD6c0esKEYBpabxDSc=",\n "SignatureVersion": "1",\n "SigningCertURL": "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",\n "Subject": "my subject",\n "Timestamp": "2015-01-01T12:00:00.000Z",\n "TopicArn": "arn:aws:sns:%s:123456789012:some-topic",\n "Type": "Notification",\n "UnsubscribeURL": "https://sns.us-east-1.amazonaws.com/?Action=Unsubscribe&SubscriptionArn=arn:aws:sns:us-east-1:123456789012:some-topic:2bcfbf39-05c3-41de-beaa-fcfcc21c8f55"\n}'
from nose.plugins.attrib import attr
@attr('slow')
@mock_sqs
@mock_sns
def test_publish_to_sqs():
@ -26,12 +33,16 @@ def test_publish_to_sqs():
conn.subscribe(TopicArn=topic_arn,
Protocol="sqs",
Endpoint="arn:aws:sqs:us-east-1:123456789012:test-queue")
conn.publish(TopicArn=topic_arn, Message="my message")
message = 'my message'
with freeze_time("2015-01-01 12:00:00"):
published_message = conn.publish(TopicArn=topic_arn, Message=message)
published_message_id = published_message['MessageId']
queue = sqs_conn.get_queue_by_name(QueueName="test-queue")
messages = queue.receive_messages(MaxNumberOfMessages=1)
messages[0].body.should.equal('my message')
expected = MESSAGE_FROM_SQS_TEMPLATE % (message, published_message_id, 'us-east-1')
acquired_message = re.sub("\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z", u'2015-01-01T12:00:00.000Z', messages[0].body)
acquired_message.should.equal(expected)
@mock_sqs
@ -58,11 +69,17 @@ def test_publish_to_sqs_dump_json():
}
}]
}, sort_keys=True)
conn.publish(TopicArn=topic_arn, Message=message)
with freeze_time("2015-01-01 12:00:00"):
published_message = conn.publish(TopicArn=topic_arn, Message=message)
published_message_id = published_message['MessageId']
queue = sqs_conn.get_queue_by_name(QueueName="test-queue")
messages = queue.receive_messages(MaxNumberOfMessages=1)
expected = u'{\\"Records\\": [{\\"eventSource\\": \\"aws:s3\\", \\"eventVersion\\": \\"2.0\\", \\"s3\\": {\\"s3SchemaVersion\\": \\"1.0\\"}}]}'
messages[0].body.should.equal(expected)
escaped = message.replace('"', '\\"')
expected = MESSAGE_FROM_SQS_TEMPLATE % (escaped, published_message_id, 'us-east-1')
acquired_message = re.sub("\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z", u'2015-01-01T12:00:00.000Z', messages[0].body)
acquired_message.should.equal(expected)
@mock_sqs
@ -80,11 +97,16 @@ def test_publish_to_sqs_in_different_region():
Protocol="sqs",
Endpoint="arn:aws:sqs:us-west-2:123456789012:test-queue")
conn.publish(TopicArn=topic_arn, Message="my message")
message = 'my message'
with freeze_time("2015-01-01 12:00:00"):
published_message = conn.publish(TopicArn=topic_arn, Message=message)
published_message_id = published_message['MessageId']
queue = sqs_conn.get_queue_by_name(QueueName="test-queue")
messages = queue.receive_messages(MaxNumberOfMessages=1)
messages[0].body.should.equal('my message')
expected = MESSAGE_FROM_SQS_TEMPLATE % (message, published_message_id, 'us-west-1')
acquired_message = re.sub("\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z", u'2015-01-01T12:00:00.000Z', messages[0].body)
acquired_message.should.equal(expected)
@freeze_time("2013-01-01")