clear-skies-aws 1.9.13__py3-none-any.whl → 1.9.15__py3-none-any.whl

{clear_skies_aws-1.9.13.dist-info → clear_skies_aws-1.9.15.dist-info}/METADATA

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

{clear_skies_aws-1.9.13.dist-info → clear_skies_aws-1.9.15.dist-info}/RECORD

@@ -1,6 +1,6 @@
 clearskies_aws/__init__.py,sha256=BZKL4SIyxx4MXpyP5hmwsMo2oJatyv5c2wjJOPzKBQ4,134
 clearskies_aws/actions/__init__.py,sha256=w_IWJg4UHV9Opv69zheH7ZHj1BnCzYLlm2JhFvHQCf8,2998
-clearskies_aws/actions/action_aws.py,sha256=hWYnYA0QNegWp2LDMYILs0Dk1TOsFykW5JgSEMwfDE8,3877
+clearskies_aws/actions/action_aws.py,sha256=zBXsvhBDDm2dAU4MVlub84Ld1YNZ6ey8_zf4OeTe8go,4254
 clearskies_aws/actions/assume_role.py,sha256=tZHKMTQaImj_EAWormFZdIPkR_db7yBwOJxYaUyuGdA,4085
 clearskies_aws/actions/assume_role_test.py,sha256=MDMGePZLVyDNTjdAlGBDJzBlfMpGIpA3Q1Ur0qEPl1w,2450
 clearskies_aws/actions/ses.py,sha256=xJ0NEFPP-8kARPGjDv1yf_bhAiaIIM1mDzMxY22GE5E,7925
@@ -9,8 +9,8 @@ clearskies_aws/actions/sns.py,sha256=00E-eCQuq3Ygscyia928K8jX8rhDZrl5kyasM0st_uI
 clearskies_aws/actions/sns_test.py,sha256=iqlaZOA-0YHPOu52-XqpCIAgAv1JZodDdlm4YYYhj8U,2306
 clearskies_aws/actions/sqs.py,sha256=i-QyyFy-ImivXk-m-Bn9Mh5BF5qODthUyZAQVRsb8vs,3392
 clearskies_aws/actions/sqs_test.py,sha256=aazVN-bY6E17Pu3hDwLldj6YPirbqXjM6LfYFomUVmQ,4040
-clearskies_aws/actions/step_function.py,sha256=0Sz1CVVeKJi3IohtLnnNmhAbuxR7Gl9ic56ml0K3Qmg,2363
-clearskies_aws/actions/step_function_test.py,sha256=3xrNYFQ8fCe3CqPEnVnJsE0rIUlnnFez4rfPzphYVUU,2742
+clearskies_aws/actions/step_function.py,sha256=wiDgGdOWdY0zVoClDsX08YFZqTR0bK3ydpyj0Qa7w_s,2599
+clearskies_aws/actions/step_function_test.py,sha256=0gRYLDVRt2R-Cv-5Pr2ui4Gbp8rg9nPhQY4ERALg6qU,3837
 clearskies_aws/backends/__init__.py,sha256=kS6pmMKZuWzBefO7qQu1fkFdcXo180t76-a-pPc1YX8,83
 clearskies_aws/backends/dynamo_db_backend.py,sha256=Ng8IORbYVSh6Sj-mjpret3qmdSeI1U9t3GJ1uUdaGd4,29574
 clearskies_aws/backends/dynamo_db_backend_test.py,sha256=iAT8d5lOho8Kv70up7wkLuf2VJhdR7qdJ-TxHsupjQI,13150
@@ -40,7 +40,7 @@ clearskies_aws/input_outputs/lambda_api_gateway_test.py,sha256=1I8yV-WjKUKpoMZa2
 clearskies_aws/input_outputs/lambda_api_gateway_web_socket.py,sha256=kG2fys9X7TailvlOBzIMItuSI8rlvDbBD4AXtI091hM,308
 clearskies_aws/input_outputs/lambda_elb.py,sha256=b675h0DxTGo9YscXN4mwzRGzP3hNSie4iPRKOg3kKPI,750
 clearskies_aws/input_outputs/lambda_http_gateway.py,sha256=YQk7GlQWtQjDiKWhX5jvXc3un1eq2sm1v_jl6iseNoQ,692
-clearskies_aws/input_outputs/lambda_invocation.py,sha256=YB1DvtpOAQjIZ6Vu-vAecbbkHQ9YheGMYHAZozN4Dzs,928
+clearskies_aws/input_outputs/lambda_invocation.py,sha256=yF3rYJ-r0YYzlh--33fGE-I-pzyhQxDmDo1TUQxCu00,1122
 clearskies_aws/input_outputs/lambda_sns.py,sha256=t1iWH1OaOm23ZSQoKgS6l53FTExFziPVju3wf86D0WY,2266
 clearskies_aws/input_outputs/lambda_sqs_standard.py,sha256=8UlYNi3DHZB9i8OXy8LsM13OIHtbOFxVh-LvyNN0yao,2185
 clearskies_aws/mocks/__init__.py,sha256=mn764gINN667tYoJfnsM6HjAAhCsO_kZ6E-fUwdLY50,22
@@ -61,7 +61,7 @@ clearskies_aws/secrets/parameter_store_test.py,sha256=UyqKE4AZYlldj9ww5f0fR15qsV
 clearskies_aws/secrets/secrets_manager.py,sha256=jlpfAFC23EeSpm50L8B-yrXg4IROQq-M_90zzXDp_ak,3056
 clearskies_aws/secrets/secrets_manager_test.py,sha256=mlNWtDm1wWS5C8aV0vJAzZVZB82KFR6NGRAPEkLtTyk,786
 clearskies_aws/web_socket_connection_model.py,sha256=d_Au_Pu7YXBfc7_lbuI7zz4MZ8ZOOwGM0oooppEofcI,1776
-clear_skies_aws-1.9.13.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
-clear_skies_aws-1.9.13.dist-info/METADATA,sha256=1RFOINl2a5ar7NqszZYfzerQ6lSp0KH9TynbpvNyBHM,8583
-clear_skies_aws-1.9.13.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-clear_skies_aws-1.9.13.dist-info/RECORD,,
+clear_skies_aws-1.9.15.dist-info/LICENSE,sha256=3Ehd0g3YOpCj8sqj0Xjq5qbOtjjgk9qzhhD9YjRQgOA,1053
+clear_skies_aws-1.9.15.dist-info/METADATA,sha256=8HgfoQ9ZjijwkHbdR8y8NEwxrVBM71eIL4OU2gi5U1k,8583
+clear_skies_aws-1.9.15.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+clear_skies_aws-1.9.15.dist-info/RECORD,,

clearskies_aws/actions/action_aws.py

@@ -62,9 +62,10 @@ class ActionAws(ABC):
             self._logging.exception(f"Failed to retrieve client for {self._name}")
             raise e
 
-    def _getClient(self) -> boto3.client:
+    def _getClient(self, region=None) -> boto3.client:
         """Retrieve the boto3 client."""
-        if self._client:
+        can_cache = not region
+        if self._client and can_cache:
             return self._client
 
         if self.assume_role:
@@ -72,12 +73,25 @@ class ActionAws(ABC):
         else:
             boto3 = self.boto3
 
-        region = self.environment.get('AWS_REGION', silent=True)
+        if not region:
+            region = self.default_region()
         if region:
-            self._client = boto3.client(self._name, region_name=region)
+            client = boto3.client(self._name, region_name=region)
         else:
-            self._client = boto3.client(self._name)
-        return self._client
+            client = boto3.client(self._name)
+
+        if can_cache:
+            self._client = client
+        return client
+
+    def default_region(self):
+        region = self.environment.get('AWS_REGION', silent=True)
+        if region:
+            return region
+        region = self.environment.get('DEFAULT_AWS_REGION', silent=True)
+        if region:
+            return region
+        return None
 
     def _execute_action(self, client: boto3.client, model: Models) -> None:
         """Run the action."""

clearskies_aws/actions/step_function.py

@@ -45,6 +45,11 @@ class StepFunction(ActionAws):
 
     def _execute_action(self, client: ModuleType, model: Models) -> None:
         """Send a notification as configured."""
+        arn = self.get_arn(model)
+        default_region = self.default_region()
+        arn_region = arn.split(':')[3]
+        if default_region and default_region != arn_region:
+            client = self._getClient(region=arn_region)
         response = client.start_execution(
             stateMachineArn=self.get_arn(model),
             input=self.get_message_body(model),

clearskies_aws/actions/step_function_test.py

@@ -30,7 +30,7 @@ class StepFunctionTest(unittest.TestCase):
         self.boto3.client = MagicMock(return_value=self.step_function)
         self.when = None
         self.environment = MagicMock()
-        self.environment.get = MagicMock(return_value='us-east-1')
+        self.environment.get = MagicMock(return_value='us-east-2')
 
     def always(self, model):
         self.when = model
@@ -43,14 +43,14 @@ class StepFunctionTest(unittest.TestCase):
     def test_execute(self):
         step_function = StepFunction(self.environment, self.boto3, self.di)
         step_function.configure(
-            arn='aws::arn::step/asdf-er',
+            arn='aws::arn:us-east-2:step/asdf-er',
             when=self.always,
             column_to_store_execution_arn="execution_arn",
         )
         step_function(self.user)
         self.step_function.start_execution.assert_has_calls([
             call(
-                stateMachineArn='aws::arn::step/asdf-er',
+                stateMachineArn='aws::arn:us-east-2:step/asdf-er',
                 input=json.dumps({
                     "id": self.user.id,
                     "email": self.user.email,
@@ -61,10 +61,36 @@ class StepFunctionTest(unittest.TestCase):
         self.assertEqual(id(self.user), id(self.when))
         self.assertEqual("aws:arn:execution", self.user.execution_arn)
 
+    def test_region_switch(self):
+        self.boto3.client.side_effect = [self.step_function, self.step_function]
+        step_function = StepFunction(self.environment, self.boto3, self.di)
+        step_function.configure(
+            arn='aws::arn:eu-west-1:step/asdf-er',
+            when=self.always,
+            column_to_store_execution_arn="execution_arn",
+        )
+        step_function(self.user)
+        self.step_function.start_execution.assert_has_calls([
+            call(
+                stateMachineArn='aws::arn:eu-west-1:step/asdf-er',
+                input=json.dumps({
+                    "id": self.user.id,
+                    "email": self.user.email,
+                    "execution_arn": None,
+                }),
+            ),
+        ])
+        self.assertEqual(id(self.user), id(self.when))
+        self.assertEqual("aws:arn:execution", self.user.execution_arn)
+        self.boto3.client.assert_has_calls([
+            call("stepfunctions", region_name="us-east-2"),
+            call("stepfunctions", region_name="eu-west-1"),
+        ])
+
     def test_not_now(self):
         step_function = StepFunction(self.environment, self.boto3, self.di)
         step_function.configure(
-            arn='arn::aws:step-function/asdf-er',
+            arn='aws::arn:us-east-2:step-function/asdf-er',
             when=self.never,
         )
         user = self.users.model({

clearskies_aws/input_outputs/lambda_invocation.py

@@ -23,7 +23,9 @@ class LambdaInvocation(LambdaAPIGateway):
     def get_body(self):
         return self._event
 
-    def json_body(self, required=True):
+    def json_body(self, required=True, allow_non_json_bodies=False):
+        # we ignore the allow_non_json_bodies flag here because with the way invoking lambdas works,
+        # the event already is an object, so it's a moot point.
         if required and not self._event:
             raise ClientError("Request body was not valid JSON")
         return self._event