clear-skies-aws 1.9.0__tar.gz → 1.9.2__tar.gz

{clear_skies_aws-1.9.0 → clear_skies_aws-1.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clear-skies-aws
-Version: 1.9.0
+Version: 1.9.2
 Summary: clearskies bindings for working in AWS
 Home-page: https://github.com/cmancone/clearskies-aws
 License: MIT

{clear_skies_aws-1.9.0 → clear_skies_aws-1.9.2}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies-aws"
-version = "1.9.0"
+version = "1.9.2"
 description = "clearskies bindings for working in AWS"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",
@@ -26,9 +26,9 @@ priority = "primary"
 
 [tool.poetry.group.dev.dependencies]
 pre-commit = "^3.2.2"
-akeyless = "^3.3.6"
-akeyless-cloud-id = "^0.2.0"
-jinja2 = "^3.1.2"
+jinja2 = {version = "^3.1.2", optional = true}
+akeyless = {version = "^4.0.0", optional = true}
+akeyless-cloud-id = {version = "^0.2.3", optional = true}
 
 [tool.poetry.extras]
 akeyless = ["akeyless-cloud-id", "akeyless"]

{clear_skies_aws-1.9.0 → clear_skies_aws-1.9.2}/src/clearskies_aws/actions/ses.py

@@ -22,9 +22,9 @@ class SES(ActionAws):
     def configure(
         self,
         sender,
-        to: Optional[Union[list, str]] = None,
-        cc: Optional[Union[list, str]] = None,
-        bcc: Optional[Union[list, str]] = None,
+        to: Optional[Union[list, str,  Callable]] = None,
+        cc: Optional[Union[list, str,  Callable]] = None,
+        bcc: Optional[Union[list, str,  Callable]] = None,
         subject: Optional[str] = None,
         message: Optional[str] = None,
         subject_template: Optional[str] = None,
@@ -48,7 +48,7 @@ class SES(ActionAws):
             destination_values = locals()[key]
             if not destination_values:
                 continue
-            if type(destination_values) == str:
+            if type(destination_values) == str or callable(destination_values):
                 self.destinations[key] = [destination_values]
             else:
                 self.destinations[key] = destination_values
@@ -136,6 +136,17 @@ class SES(ActionAws):
         resolved = []
         destinations = self.destinations[name]
         for destination in destinations:
+            if callable(destination):
+                more = self.di.call_function(destination, model=model)
+                if not isinstance(more, list):
+                    more = [more]
+                for entry in more:
+                    if not isinstance(entry, str):
+                        raise ValueError(f"I invoked a callable to fetch the '{name}' addresses for model '{model.__class__.__name__}' but it returned something other than a string.  Callables must return a valid email address or a list of email addresses.")
+                    if "@" not in entry:
+                        raise ValueError(f"I invoked a callable to fetch the '{name}' addresses for model '{model.__class__.__name__}' but it returned a non-email address.  Callables must return a valid email address or a list of email addresses.")
+                resolved.extend(more)
+                continue
             if "@" in destination:
                 resolved.append(destination)
                 continue

{clear_skies_aws-1.9.0 → clear_skies_aws-1.9.2}/src/clearskies_aws/actions/ses_test.py

@@ -48,3 +48,42 @@ class SESTest(unittest.TestCase):
                 Source='test@example.com'
             ),
         ])
+
+    def test_send_callable(self):
+        ses = SES(self.environment, self.boto3, self.di)
+        ses.configure(
+            'test@example.com',
+            to=lambda model: 'jane@example.com',
+            bcc=lambda model: ['bob@example.com', 'greg@example.com'],
+            subject='welcome!',
+            message_template='hi {{ model.id }}!'
+        )
+        model = MagicMock()
+        model.id = 'asdf'
+        ses(model)
+        self.ses.send_email.assert_has_calls([
+            call(
+                Destination={
+                    'ToAddresses': ['jane@example.com'],
+                    'CcAddresses': [],
+                    'BccAddresses': ['bob@example.com', 'greg@example.com']
+                },
+                Message={
+                    'Body': {
+                        'Html': {
+                            'Charset': 'utf-8',
+                            'Data': 'hi asdf!'
+                        },
+                        'Text': {
+                            'Charset': 'utf-8',
+                            'Data': 'hi asdf!'
+                        }
+                    },
+                    'Subject': {
+                        'Charset': 'utf-8',
+                        'Data': 'welcome!'
+                    }
+                },
+                Source='test@example.com'
+            ),
+        ])