Fix #2286 : SQS - Enhance support for receiving message attributes. Allow string in msg body. (#2300)

* Enhance support for receiving message attributes. Allow string in body of sqs message

* fix lint errors

* Add name to Authors

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* pr comment updates, refactor, and add more test coverage

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update kombu/asynchronous/http/urllib3_client.py

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Asif Saif Uddin <[email protected]>

Author: 3 people

.gitignore

@@ -39,3 +39,5 @@ env
 .coverage.*
 control/
 .env
+.hypothesis/*
+junit.xml

AUTHORS

@@ -7,6 +7,7 @@ Adam Gaca <[email protected]>
 Adam Nelson <[email protected]>
 Adam Wentz
 Alan Justino <[email protected]>
+Alex Jones
 Alex Koshelev <[email protected]>
 Alexandre Bourget <[email protected]>
 Anastasis Andronidis <[email protected]>

kombu/asynchronous/aws/sqs/connection.py

@@ -20,17 +20,28 @@
 class AsyncSQSConnection(AsyncAWSQueryConnection):
     """Async SQS Connection."""
 
-    def __init__(self, sqs_connection, debug=0, region=None, fetch_message_attributes=None, **kwargs):
+    def __init__(
+        self,
+        sqs_connection,
+        debug=0,
+        region=None,
+        message_system_attribute_names=None,
+        message_attribute_names=None,
+        **kwargs
+    ):
         if boto3 is None:
             raise ImportError('boto3 is not installed')
         super().__init__(
             sqs_connection,
             region_name=region, debug=debug,
             **kwargs
         )
-        self.fetch_message_attributes = (
-            fetch_message_attributes if fetch_message_attributes is not None
-            else ["ApproximateReceiveCount"]
+        self.message_system_attribute_names = (
+            message_system_attribute_names if message_system_attribute_names else ["ApproximateReceiveCount"]
+        )
+        self.message_attribute_names = (
+            [message_attribute_names] if isinstance(message_attribute_names, str)
+            else (message_attribute_names or [])
         )
 
     def _create_query_request(self, operation, params, queue_url, method):
@@ -160,13 +171,17 @@ def receive_message(
     ):
         params = {'MaxNumberOfMessages': number_messages}
         proto_params = {'query': {}, 'json': {}}
-        attrs = attributes if attributes is not None else self.fetch_message_attributes
+        attrs = attributes if attributes is not None else self.message_system_attribute_names
+        msg_attr_names = self.message_attribute_names if self.message_attribute_names else None
 
         if visibility_timeout:
             params['VisibilityTimeout'] = visibility_timeout
         if attrs:
-            proto_params['json'].update({'AttributeNames': list(attrs)})
-            proto_params['query'].update(_query_object_encode({'AttributeName': list(attrs)}))
+            proto_params['json'].update({'MessageSystemAttributeNames': list(attrs)})
+            proto_params['query'].update(_query_object_encode({'MessageSystemAttributeName': list(attrs)}))
+        if msg_attr_names:
+            proto_params['json'].update({'MessageAttributeNames': list(msg_attr_names)})
+            proto_params['query'].update(_query_object_encode({'MessageAttributeNames': list(msg_attr_names)}))
         if wait_time_seconds is not None:
             params['WaitTimeSeconds'] = wait_time_seconds