Merge pull request #2830 from gruebel/fix-sqs-raw-message-delivery

Fix missing MessageAttributes when using RawMessageDelivery

moto/sns/models.py

@@ -146,20 +146,38 @@ class Subscription(BaseModel):
             queue_name = self.endpoint.split(":")[-1]
             region = self.endpoint.split(":")[3]
             if self.attributes.get("RawMessageDelivery") != "true":
-                enveloped_message = json.dumps(
+                sqs_backends[region].send_message(
-                    self.get_post_data(
+                    queue_name,
-                        message,
+                    json.dumps(
-                        message_id,
+                        self.get_post_data(
-                        subject,
+                            message,
-                        message_attributes=message_attributes,
+                            message_id,
+                            subject,
+                            message_attributes=message_attributes,
+                        ),
+                        sort_keys=True,
+                        indent=2,
+                        separators=(",", ": "),
                     ),
-                    sort_keys=True,
-                    indent=2,
-                    separators=(",", ": "),
                 )
             else:
-                enveloped_message = message
+                raw_message_attributes = {}
-            sqs_backends[region].send_message(queue_name, enveloped_message)
+                for key, value in message_attributes.items():
+                    type = "string_value"
+                    type_value = value["Value"]
+                    if value["Type"].startswith("Binary"):
+                        type = "binary_value"
+                    elif value["Type"].startswith("Number"):
+                        type_value = "{0:g}".format(value["Value"])
+
+                    raw_message_attributes[key] = {
+                        "data_type": value["Type"],
+                        type: type_value,
+                    }
+
+                sqs_backends[region].send_message(
+                    queue_name, message, message_attributes=raw_message_attributes
+                )
         elif self.protocol in ["http", "https"]:
             post_data = self.get_post_data(message, message_id, subject)
             requests.post(

tests/test_sns/test_publishing_boto3.py

@@ -148,34 +148,42 @@ def test_publish_to_sqs_msg_attr_byte_value():
     conn.create_topic(Name="some-topic")
     response = conn.list_topics()
     topic_arn = response["Topics"][0]["TopicArn"]
-
+    sqs = boto3.resource("sqs", region_name="us-east-1")
-    sqs_conn = boto3.resource("sqs", region_name="us-east-1")
+    queue = sqs.create_queue(QueueName="test-queue")
-    queue = sqs_conn.create_queue(QueueName="test-queue")
+    conn.subscribe(
-
+        TopicArn=topic_arn, Protocol="sqs", Endpoint=queue.attributes["QueueArn"],
+    )
+    queue_raw = sqs.create_queue(QueueName="test-queue-raw")
     conn.subscribe(
         TopicArn=topic_arn,
         Protocol="sqs",
-        Endpoint="arn:aws:sqs:us-east-1:{}:test-queue".format(ACCOUNT_ID),
+        Endpoint=queue_raw.attributes["QueueArn"],
+        Attributes={"RawMessageDelivery": "true"},
     )
-    message = "my message"
+
     conn.publish(
         TopicArn=topic_arn,
-        Message=message,
+        Message="my message",
         MessageAttributes={
             "store": {"DataType": "Binary", "BinaryValue": b"\x02\x03\x04"}
         },
     )
-    messages = queue.receive_messages(MaxNumberOfMessages=5)
+
-    message_attributes = [json.loads(m.body)["MessageAttributes"] for m in messages]
+    message = json.loads(queue.receive_messages()[0].body)
-    message_attributes.should.equal(
+    message["Message"].should.equal("my message")
-        [
+    message["MessageAttributes"].should.equal(
-            {
+        {
-                "store": {
+            "store": {
-                    "Type": "Binary",
+                "Type": "Binary",
-                    "Value": base64.b64encode(b"\x02\x03\x04").decode(),
+                "Value": base64.b64encode(b"\x02\x03\x04").decode(),
-                }
             }
-        ]
+        }
+    )
+
+    message = queue_raw.receive_messages()[0]
+    message.body.should.equal("my message")
+    message.message_attributes.should.equal(
+        {"store": {"DataType": "Binary", "BinaryValue": b"\x02\x03\x04"}}
     )
 
 
@@ -187,6 +195,12 @@ def test_publish_to_sqs_msg_attr_number_type():
     sqs = boto3.resource("sqs", region_name="us-east-1")
     queue = sqs.create_queue(QueueName="test-queue")
     topic.subscribe(Protocol="sqs", Endpoint=queue.attributes["QueueArn"])
+    queue_raw = sqs.create_queue(QueueName="test-queue-raw")
+    topic.subscribe(
+        Protocol="sqs",
+        Endpoint=queue_raw.attributes["QueueArn"],
+        Attributes={"RawMessageDelivery": "true"},
+    )
 
     topic.publish(
         Message="test message",
@@ -199,6 +213,12 @@ def test_publish_to_sqs_msg_attr_number_type():
         {"retries": {"Type": "Number", "Value": 0}}
     )
 
+    message = queue_raw.receive_messages()[0]
+    message.body.should.equal("test message")
+    message.message_attributes.should.equal(
+        {"retries": {"DataType": "Number", "StringValue": "0"}}
+    )
+
 
 @mock_sns
 def test_publish_sms():