clear-skies-aws 1.9.14__tar.gz → 1.9.16__tar.gz

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/PKG-INFO

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

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "clear-skies-aws"
-version = "1.9.14"
+version = "1.9.16"
 description = "clearskies bindings for working in AWS"
 authors = [
     "Conor Mancone <cmancone@gmail.com>",

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/src/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."""

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/src/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),

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/src/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({

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/src/clearskies_aws/contexts/lambda_sns.py

@@ -14,12 +14,12 @@ class LambdaSns(Context):
             **config,
         }
 
-    def __call__(self, event, context):
+    def __call__(self, event, context, method=None, url=None):
         if self.handler is None:
             raise ValueError("Cannot execute LambdaSnsEvent context without first configuring it")
 
         try:
-            return self.handler(LambdaSnsInputOutput(event, context))
+            return self.handler(LambdaSnsInputOutput(event, context, method=method, url=url))
         except Exception as e:
             print('Failed message ' + event['Records'][0]['Sns']['MessageId'] + '. Error error: ' + str(e))
             raise e

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/src/clearskies_aws/contexts/lambda_sqs_standard_partial_batch.py

@@ -14,14 +14,14 @@ class LambdaSqsStandardPartialBatch(Context):
             **config,
         }
 
-    def __call__(self, event, context):
+    def __call__(self, event, context, url=None, method=None):
         if self.handler is None:
             raise ValueError("Cannot execute LambdaELB context without first configuring it")
 
         item_failures = []
         for record in event['Records']:
             try:
-                self.handler(LambdaSqsStandardInputOutput(record['body'], event, context))
+                self.handler(LambdaSqsStandardInputOutput(record['body'], event, context, url=url, method=method))
             except Exception as e:
                 print('Failed message ' + record['messageId'] + ' being returned for retry.  Error error: ' + str(e))
                 traceback.print_tb(e.__traceback__)

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/src/clearskies_aws/input_outputs/lambda_sns.py

@@ -2,9 +2,11 @@ from .lambda_api_gateway import LambdaAPIGateway
 from clearskies.handlers.exceptions import ClientError
 import json
 class LambdaSns(LambdaAPIGateway):
-    def __init__(self, event, context):
+    def __init__(self, event, context, url=None, method=None):
         self._event = event
         self._context = context
+        self._path = url if url else ''
+        self._request_method = method.upper() if method else 'GET'
         record = event['Records'][0]['Sns']['Message']
         try:
             self._record = json.loads(record)

{clear_skies_aws-1.9.14 → clear_skies_aws-1.9.16}/src/clearskies_aws/input_outputs/lambda_sqs_standard.py

@@ -2,10 +2,12 @@ from .lambda_api_gateway import LambdaAPIGateway
 from clearskies.handlers.exceptions import ClientError
 import json
 class LambdaSqsStandard(LambdaAPIGateway):
-    def __init__(self, record, event, context):
+    def __init__(self, record, event, context, url=None, method=None):
         self._record = record
         self._context = context
         self._event = event
+        self._path = url if url else ''
+        self._request_method = method.upper() if method else 'GET'
 
     def respond(self, body, status_code=200):
         pass