clear-skies-aws 1.9.3__tar.gz → 1.9.5__tar.gz

{clear_skies_aws-1.9.3 → clear_skies_aws-1.9.5}/PKG-INFO

@@ -1,16 +1,14 @@
 Metadata-Version: 2.1
 Name: clear-skies-aws
-Version: 1.9.3
+Version: 1.9.5
 Summary: clearskies bindings for working in AWS
 Home-page: https://github.com/cmancone/clearskies-aws
 License: MIT
 Author: Conor Mancone
 Author-email: cmancone@gmail.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Provides-Extra: akeyless

{clear_skies_aws-1.9.3 → clear_skies_aws-1.9.5}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies-aws"
-version = "1.9.3"
+version = "1.9.5"
 description = "clearskies bindings for working in AWS"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",
@@ -16,7 +16,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.10"
 clear-skies = "^1.14.4"
 boto3 = "^1.26.148"
 

{clear_skies_aws-1.9.3 → clear_skies_aws-1.9.5}/src/clearskies_aws/actions/__init__.py

@@ -60,6 +60,7 @@ def sqs(
     message_callable=None,
     when=None,
     assume_role=None,
+    message_group_id=None,
 ):
     return clearskies.BindingConfig(
         SQS,
@@ -69,6 +70,7 @@ def sqs(
         message_callable=message_callable,
         when=when,
         assume_role=assume_role,
+        message_group_id=message_group_id,
     )
 def step_function(
     arn: str = "",

{clear_skies_aws-1.9.3 → clear_skies_aws-1.9.5}/src/clearskies_aws/actions/sqs.py

@@ -8,7 +8,7 @@ from clearskies.model import Model
 from collections.abc import Sequence
 from collections import OrderedDict
 from types import ModuleType
-from typing import List, Optional, Callable
+from typing import List, Optional, Callable, Union
 
 from ..di import StandardDependencies
 from . import assume_role
@@ -28,12 +28,14 @@ class SQS(ActionAws):
         message_callable: Optional[Callable] = None,
         when: Optional[Callable] = None,
         assume_role: Optional[assume_role.AssumeRole] = None,
+        message_group_id: Optional[Union[str, Callable]] = None,
     ) -> None:
         super().configure(message_callable=message_callable, when=when, assume_role=assume_role)
 
         self.queue_url = queue_url
         self.queue_url_environment_key = queue_url_environment_key
         self.queue_url_callable = queue_url_callable
+        self.message_group_id = message_group_id
 
         queue_urls = 0
         for value in [queue_url, queue_url_environment_key, queue_url_callable]:
@@ -47,13 +49,28 @@ class SQS(ActionAws):
             raise ValueError(
                 "You must provide at least one of 'queue_url', 'queue_url_environment_key', or 'queue_url_callable'."
             )
+        if message_group_id and not callable(message_group_id) and not isinstance(message_group_id, str):
+            raise ValueError(
+                "If provided, 'message_group_id' must be a string or callable, but the provided value was neither."
+            )
 
     def _execute_action(self, client: ModuleType, model: Model) -> None:
         """Send a notification as configured."""
-        client.send_message(
-            QueueUrl=self.get_queue_url(model),
-            MessageBody=self.get_message_body(model),
-        )
+        params = {
+            "QueueUrl": self.get_queue_url(model),
+            "MessageBody": self.get_message_body(model),
+        }
+
+        if self.message_group_id:
+            if callable(self.message_group_id):
+                message_group_id = self.di.call_function(self.message_group_id, model=model)
+                if not isinstance(message_group_id, str):
+                    raise ValueError(f"I called the message_group_id function for SQS for model '{model.__class__.__name__}' but the value it returned was not a string.  The message group id must be a string.")
+            else:
+                message_group_id = self.message_group_id
+            params["MessageGroupId"] = message_group_id
+
+        client.send_message(**params)
 
     def get_queue_url(self, model: Model):
         if self.queue_url:

{clear_skies_aws-1.9.3 → clear_skies_aws-1.9.5}/src/clearskies_aws/actions/sqs_test.py

@@ -59,6 +59,58 @@ class SQSTest(unittest.TestCase):
         ])
         self.assertEqual(id(user), id(self.when))
 
+    def test_send_message_group_id(self):
+        sqs = SQS(self.environment, self.boto3, self.di)
+        sqs.configure(
+            queue_url='https://queue.example.com',
+            when=self.always,
+            message_group_id='heysup',
+        )
+        user = self.users.model({
+            "id": "1-2-3-4",
+            "name": "Jane",
+            "email": "jane@example.com",
+        })
+        sqs(user)
+        self.sqs.send_message.assert_has_calls([
+            call(
+                QueueUrl='https://queue.example.com',
+                MessageGroupId='heysup',
+                MessageBody=json.dumps({
+                    "id": "1-2-3-4",
+                    "name": "Jane",
+                    "email": "jane@example.com",
+                }),
+            ),
+        ])
+        self.assertEqual(id(user), id(self.when))
+
+    def test_send_message_group_id_callable(self):
+        sqs = SQS(self.environment, self.boto3, self.di)
+        sqs.configure(
+            queue_url='https://queue.example.com',
+            when=self.always,
+            message_group_id=lambda model: model.id,
+        )
+        user = self.users.model({
+            "id": "1-2-3-4",
+            "name": "Jane",
+            "email": "jane@example.com",
+        })
+        sqs(user)
+        self.sqs.send_message.assert_has_calls([
+            call(
+                QueueUrl='https://queue.example.com',
+                MessageGroupId='1-2-3-4',
+                MessageBody=json.dumps({
+                    "id": "1-2-3-4",
+                    "name": "Jane",
+                    "email": "jane@example.com",
+                }),
+            ),
+        ])
+        self.assertEqual(id(user), id(self.when))
+
     def test_not_now(self):
         sqs = SQS(self.environment, self.boto3, self.di)
         sqs.configure(