Clean references to boto2

Author: jbbarth

simpleflow/swf/mapper/actors/core.py

@@ -5,9 +5,6 @@
 from simpleflow.swf.mapper.core import ConnectedSWFObject
 from simpleflow.swf.mapper.models.domain import Domain
 
-if TYPE_CHECKING:
-    from boto.exception import SWFResponseError
-
 
 class Actor(ConnectedSWFObject):
     """SWF Actor base class.
@@ -50,11 +47,3 @@ def stop(self):
         shutting down.
         """
         raise NotImplementedError
-
-    def get_error_message(self, e: SWFResponseError) -> str:
-        message = e.error_message
-        if not message:
-            if e.body:
-                # Expected 'message', got 'Message' ¯\_(ツ)_/¯
-                message = e.body.get("Message")
-        return message

simpleflow/swf/mapper/actors/decider.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING, Any
 
-import boto.exception
 from botocore.exceptions import ClientError
 
 from simpleflow import format, logging_context

simpleflow/swf/mapper/actors/worker.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING, Any
 
-import boto.exception
 from botocore.exceptions import ClientError
 
 from simpleflow import format, logging_context

simpleflow/swf/mapper/core.py

@@ -8,9 +8,8 @@
 import os
 from typing import Any
 
-import boto.swf  # noqa
 import boto3
-from boto.exception import NoAuthHandlerFound
+from botocore.exceptions import NoCredentialsError
 
 # NB: import logger directly from simpleflow so we benefit from the logging
 # config hosted in simpleflow. This wouldn't be the case with a standard
@@ -23,6 +22,7 @@
 
 SETTINGS = settings.get()
 RETRIES = int(os.environ.get("SWF_CONNECTION_RETRIES", "5"))
+DEFAULT_AWS_REGION = "us-east-1"
 
 
 class ConnectedSWFObject:
@@ -31,26 +31,21 @@ class ConnectedSWFObject:
     __slots__ = ["region", "connection", "boto3_client"]
 
     region: str
-    connection: boto.swf.layer1.Layer1
     boto3_client: boto3.client
 
     @retry.with_delay(
         nb_times=RETRIES,
         delay=retry.exponential,
-        on_exceptions=(TypeError, NoAuthHandlerFound),
+        on_exceptions=(TypeError, NoCredentialsError),
     )
     def __init__(self, *args, **kwargs):
-        self.region = SETTINGS.get("region") or kwargs.get("region") or boto.swf.layer1.Layer1.DefaultRegionName
+        self.region = SETTINGS.get("region") or kwargs.get("region") or DEFAULT_AWS_REGION
         # Use settings-provided keys if available, otherwise pass empty
         # dictionary to boto SWF client, which will use its default credentials
         # chain provider.
         cred_keys = ["aws_access_key_id", "aws_secret_access_key"]
         creds_ = {k: SETTINGS[k] for k in cred_keys if SETTINGS.get(k, None)}
 
-        self.connection = kwargs.pop("connection", None) or boto.swf.connect_to_region(self.region, **creds_)
-        if self.connection is None:
-            raise ValueError(f"invalid region: {self.region}")
-
         self.boto3_client = kwargs.pop("boto3_client", None)
         if not self.boto3_client:
             session = boto3.session.Session(region_name=self.region)

simpleflow/swf/mapper/exceptions.py

@@ -5,7 +5,6 @@
 from functools import partial, wraps
 from typing import Any, Callable
 
-import boto.exception
 from botocore.exceptions import ClientError
 
 
@@ -140,17 +139,6 @@ def match_equals(regex, string, values):
     return matched[0] in values
 
 
-def is_swf_response_error(error):
-    """
-    Return true if *error* is a :class:`SWFResponseError` exception.
-
-    :param error: is the exception to check.
-    :type  error: Exception.
-
-    """
-    return isinstance(error, boto.exception.SWFResponseError)
-
-
 def is_unknown_resource_raised(error, *args, **kwargs):
     """
     Handler that checks if *error* is an unknown resource fault.
@@ -159,7 +147,7 @@ def is_unknown_resource_raised(error, *args, **kwargs):
     :type  error: Exception
 
     """
-    if not isinstance(error, (boto.exception.SWFResponseError, ClientError)):
+    if not isinstance(error, ClientError):
         return False
 
     return extract_error_code(error) == "UnknownResourceFault"
@@ -241,77 +229,6 @@ def raises(exception, when, extract: Callable[[Any], str] = str):
 
     :param when: predicate to apply.
     :type  when: (error, *args, **kwargs) -> bool
-
-    Examples
-    --------
-
-    Let's build a :class:`boto.swf.exceptions.SWFResponseError` for an unknown
-    execution:
-
-    FIXME commented-out these doctests for now as they fail on python3
-    (returning simpleflow.swf.mapper.exceptions.DoesNotExistError and such, not just DoesNotExistError)
-    # >>> status = 400
-    # >>> reason = 'Bad Request'
-    # >>> body_type = 'com.amazonaws.swf.base.model#UnknownResourceFault'
-    # >>> body_message = 'Unknown execution: blah'
-    # >>> body = {'__type': body_type, 'message': body_message}
-    # >>> error_code = 'UnknownResourceFault'
-    # >>> from boto.swf.exceptions import SWFResponseError
-    # >>> err = SWFResponseError(status, reason, body, error_code)
-    # >>> raises(DoesNotExistError,
-    # ...        when=is_unknown_resource_raised,
-    # ...        extract=extract_resource)(err)
-    # Traceback (most recent call last):
-    #     ...
-    # DoesNotExistError: Resource execution does not exist
-    #
-    # >>> body = {'__type': body_type}
-    # >>> err = SWFResponseError(status, reason, body, error_code)
-    # >>> raises(DoesNotExistError,
-    # ...        when=is_unknown_resource_raised,
-    # ...        extract=extract_resource)(err)
-    # Traceback (most recent call last):
-    #     ...
-    # DoesNotExistError: Resource unknown does not exist
-    #
-    # Now, we do the same for an unknown domain:
-    #
-    # >>> body_message = 'Unknown domain'
-    # >>> body = {'__type': body_type, 'message': body_message}
-    # >>> err = SWFResponseError(status, reason, body, error_code)
-    # >>> raises(DoesNotExistError,
-    # ...        when=is_unknown_resource_raised,
-    # ...        extract=extract_resource)(err)
-    # Traceback (most recent call last):
-    #     ...
-    # DoesNotExistError: Resource domain does not exist
-    #
-    # If it does not detect an error related to an unknown resource,
-    # it raises a :class:`ResponseError`:
-    #
-    # >>> body_message = 'Other Fault'
-    # >>> body = {'__type': body_type, 'message': body_message}
-    # >>> err = SWFResponseError(status, reason, body, error_code)
-    # >>> err.error_code = 'OtherFault'
-    # >>> raises(DoesNotExistError,
-    # ...        when=is_unknown_resource_raised,
-    # ...        extract=extract_resource)(err)
-    # ... # doctest: +IGNORE_EXCEPTION_DETAIL
-    # Traceback (most recent call last):
-    #     ...
-    # SWFResponseError: SWFResponseError: 400 Bad Request
-    # {'message': 'Other Fault', '__type': 'com.amazonaws.swf.base.model#UnknownResourceFault'}
-    #
-    # If it's not a :class:`boto.swf.exceptions.SWFResponseError`, it
-    # raises the exception as-is:
-    #
-    # >>> raises(DoesNotExistError,
-    # ...        when=is_unknown_resource_raised,
-    # ...        extract=extract_resource)(Exception('boom!'))
-    # Traceback (most recent call last):
-    #     ...
-    # Exception: boom!
-
     """
 
     @wraps(raises)

simpleflow/swf/mapper/models/activity.py

@@ -7,7 +7,6 @@
 
 from typing import TYPE_CHECKING, Any, List
 
-from boto.swf.exceptions import SWFResponseError, SWFTypeAlreadyExistsError  # noqa
 from botocore.exceptions import ClientError
 
 from simpleflow.swf.mapper import exceptions

simpleflow/swf/mapper/querysets/domain.py

@@ -55,7 +55,6 @@ def get(self, name: str, *args, **kwargs) -> Domain:
             domain_info["name"],
             status=domain_info["status"],
             retention_period=domain_config["workflowExecutionRetentionPeriodInDays"],
-            connection=self.connection,
         )
 
     def get_or_create(

simpleflow/swf/mapper/querysets/workflow.py

@@ -7,7 +7,6 @@
 
 from typing import Any
 
-from boto.swf.exceptions import SWFResponseError  # noqa
 from botocore.exceptions import ClientError
 
 from simpleflow.swf.mapper.constants import MAX_WORKFLOW_AGE, REGISTERED

tests/data/constants.py

@@ -1,9 +1,6 @@
 from __future__ import annotations
 
-from unittest.mock import patch
+from simpleflow.swf.mapper.models import Domain
 
-import simpleflow.swf.mapper.models
-
-with patch("boto.swf.connect_to_region"):
-    DOMAIN = simpleflow.swf.mapper.models.Domain("TestDomain")
+DOMAIN = Domain("TestDomain")
 DEFAULT_VERSION = "test"

tests/integration/__init__.py

@@ -4,7 +4,6 @@
 import os
 from typing import TYPE_CHECKING
 
-import boto.swf  # noqa
 import boto3
 from click.testing import CliRunner
 from sure import expect
@@ -62,12 +61,6 @@ def domain(self):
     def workflow_id(self):
         return WORKFLOW_ID
 
-    @property
-    def conn(self):
-        if not hasattr(self, "_conn"):
-            self._conn = boto.swf.connect_to_region(self.region)
-        return self._conn
-
     @property
     def boto3_client(self):
         if not hasattr(self, "_boto3_client"):