diaspora-event-sdk 0.3.5__tar.gz → 0.3.7__tar.gz

{diaspora-event-sdk-0.3.5/diaspora_event_sdk.egg-info → diaspora-event-sdk-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.3.5
+Version: 0.3.7
 Summary: Diaspora Event Fabric SDK
 Home-page: https://github.com/globus-labs/diaspora-event-sdk
 License: Apache 2.0

{diaspora-event-sdk-0.3.5 → diaspora-event-sdk-0.3.7}/diaspora_event_sdk/sdk/client.py

@@ -31,7 +31,7 @@ class Client:
             base_url=self.web_service_address
         )
         self.auth_client = self.login_manager.get_auth_client()
-        self.subject_openid = self.auth_client.oauth2_userinfo()["sub"]
+        self.subject_openid = self.auth_client.userinfo()["sub"]
 
     def logout(self):
         """Remove credentials from your local system"""

{diaspora-event-sdk-0.3.5 → diaspora-event-sdk-0.3.7}/diaspora_event_sdk/sdk/kafka_client.py

@@ -27,7 +27,6 @@ def get_diaspora_config(extra_configs: Dict[str, Any] = {}) -> Dict[str, Any]:
     Merges default configurations with custom ones provided.
     """
 
-    bootstrap_servers = None
     try:
         if (
             "OCTOPUS_AWS_ACCESS_KEY_ID" not in os.environ
@@ -37,14 +36,13 @@ def get_diaspora_config(extra_configs: Dict[str, Any] = {}) -> Dict[str, Any]:
             keys = Client().retrieve_key()
             os.environ["OCTOPUS_AWS_ACCESS_KEY_ID"] = keys["access_key"]
             os.environ["OCTOPUS_AWS_SECRET_ACCESS_KEY"] = keys["secret_key"]
-            bootstrap_servers = keys["endpoint"]
-        else:
-            bootstrap_servers = os.environ["OCTOPUS_BOOTSTRAP_SERVERS"]
+            os.environ["OCTOPUS_BOOTSTRAP_SERVERS"] = keys["endpoint"]
+
     except Exception as e:
         raise RuntimeError("Failed to retrieve Kafka keys") from e
 
     conf = {
-        "bootstrap_servers": bootstrap_servers,
+        "bootstrap_servers": os.environ["OCTOPUS_BOOTSTRAP_SERVERS"],
         "security_protocol": "SASL_SSL",
         "sasl_mechanism": "OAUTHBEARER",
         "api_version": (3, 5, 1),
@@ -100,8 +98,9 @@ def block_until_ready(max_minutes=5):
                 value={"message": "Synchronous message from Diaspora SDK"},
             )
             result["producer_connection_test"] = future.get(timeout=10)
-        except Exception:
-            pass
+        except Exception as e:
+            raise e
+            print(e)
 
     def consumer_connection_test(result):
         try:
@@ -113,8 +112,9 @@ def block_until_ready(max_minutes=5):
             for msg in consumer:
                 result["consumer_connection_test"] = msg
                 break
-        except Exception:
-            pass
+        except Exception as e:
+            raise e
+            print(e)
 
     result, retry_count = {}, 0
     start_time = time.time()

diaspora-event-sdk-0.3.7/diaspora_event_sdk/version.py

@@ -0,0 +1 @@
+__version__ = "0.3.7"

{diaspora-event-sdk-0.3.5 → diaspora-event-sdk-0.3.7/diaspora_event_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.3.5
+Version: 0.3.7
 Summary: Diaspora Event Fabric SDK
 Home-page: https://github.com/globus-labs/diaspora-event-sdk
 License: Apache 2.0

{diaspora-event-sdk-0.3.5 → diaspora-event-sdk-0.3.7}/tests/unit/client_test.py

@@ -11,7 +11,7 @@ def mock_login_manager():  # TODO
     login_manager = Mock(spec=LoginManager())
     login_manager.get_web_client.return_value = Mock(spec=WebClient)
     login_manager.get_auth_client.return_value = Mock(
-        oauth2_userinfo=lambda: {"sub": "test_sub"}
+        userinfo=lambda: {"sub": "test_sub"}
     )
     login_manager._token_storage.get_token_data.return_value = {
         "username": "test_sub",

diaspora-event-sdk-0.3.5/diaspora_event_sdk/version.py

@@ -1 +0,0 @@
-__version__ = "0.3.5"