Add Session Object to SessionProxy (#164)

* Add Session Object to SessionProxy

Allows for the user of the plugin to retrieve the boto3 Session object
and use it directly as needed.

Co-authored-by: Alex Wood <[email protected]>
Co-authored-by: Anton Mokhovikov <[email protected]>

Author: 3 people

src/cloudformation_cli_python_lib/boto3_proxy.py

@@ -10,6 +10,7 @@ class SessionProxy:
     def __init__(self, session: Session):
         self.client = session.client
         self.resource = session.resource
+        self.session = session
 
 
 def _get_boto_session(

src/cloudformation_cli_python_lib/log_delivery.py

@@ -90,7 +90,7 @@ def _put_log_event(self, msg: logging.LogRecord) -> None:
             self.client.exceptions.DataAlreadyAcceptedException,
             self.client.exceptions.InvalidSequenceTokenException,
         ) as e:
-            self.sequence_token = str(e).split(" ")[-1]
+            self.sequence_token = str(e).rsplit(" ", maxsplit=1)[-1]
             self._put_log_event(msg)
 
     def emit(self, record: logging.LogRecord) -> None:

tests/lib/boto3_proxy_test.py

@@ -1,6 +1,9 @@
+from boto3.session import Session
 from cloudformation_cli_python_lib.boto3_proxy import SessionProxy, _get_boto_session
 from cloudformation_cli_python_lib.utils import Credentials
 
+import botocore  # pylint: disable=C0411
+
 
 def test_get_boto_session_returns_proxy():
     proxy = _get_boto_session(Credentials("", "", ""))
@@ -10,3 +13,17 @@ def test_get_boto_session_returns_proxy():
 def test_get_boto_session_returns_none():
     proxy = _get_boto_session(None)
     assert proxy is None
+
+
+def test_can_create_boto_client():
+    proxy = _get_boto_session(Credentials("", "", ""))
+    client = proxy.client(
+        "s3", region_name="us-west-2"
+    )  # just in case AWS_REGION not set in test environment
+    assert isinstance(client, botocore.client.BaseClient)
+
+
+def test_can_retrieve_boto_session():
+    proxy = _get_boto_session(Credentials("", "", ""))
+    session = proxy.session
+    assert isinstance(session, Session)