diaspora-event-sdk 0.3.6__tar.gz → 0.3.8__tar.gz

{diaspora-event-sdk-0.3.6/diaspora_event_sdk.egg-info → diaspora-event-sdk-0.3.8}/PKG-INFO

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

{diaspora-event-sdk-0.3.6 → diaspora-event-sdk-0.3.8}/diaspora_event_sdk/sdk/_environments.py

@@ -2,7 +2,6 @@ import os
 from typing import Union
 
 
-# TOKEN_EXCHANGE = "http://3.220.110.101/"
 DIASPORA_RESOURCE_SERVER = "2b9d2f5c-fa32-45b5-875b-b24cd343b917"
 
 
@@ -13,10 +12,10 @@ def _get_envname():
 def get_web_service_url(envname: Union[str, None] = None) -> str:
     env = envname or _get_envname()
     urls = {
-        "production": "https://diaspora-web-service.ml22sevubfnks.us-east-1.cs.amazonlightsail.com",
-        "dev": "https://diaspora-web-service-dev.ml22sevubfnks.us-east-1.cs.amazonlightsail.com",
+        "production": "https://diaspora-web-service.qpp943wkvr7b2.us-east-1.cs.amazonlightsail.com/",
+        "dev": "https://diaspora-web-service.qpp943wkvr7b2.us-east-1.cs.amazonlightsail.com/",
         "local": "http://localhost:8000",
-        "legacy": "http://3.220.110.101/",
+        "legacy": "https://diaspora-web-service-dev.ml22sevubfnks.us-east-1.cs.amazonlightsail.com",
     }
 
     return urls.get(env, urls["production"])

{diaspora-event-sdk-0.3.6 → diaspora-event-sdk-0.3.8}/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.8/diaspora_event_sdk/version.py

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

{diaspora-event-sdk-0.3.6 → diaspora-event-sdk-0.3.8/diaspora_event_sdk.egg-info}/PKG-INFO

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

{diaspora-event-sdk-0.3.6 → diaspora-event-sdk-0.3.8}/tests/unit/apis_test.py

@@ -66,6 +66,7 @@ def test_register_topic(setup, client):
 
 def test_list_topics(setup, client):
     topics = client.list_topics()
+    print(client.subject_openid, topics)
     assert topics["status"] == "success"
     assert isinstance(topics["topics"], list)
     assert len(topics["topics"]) > 0
@@ -116,7 +117,7 @@ def test_reset_topic(setup, client):
 def test_user_access_management(setup, client):
     topic = "topic" + client.subject_openid[-12:]
     client.register_topic(topic)
-    user_id = "e2a8169b-feef-4d56-8eba-ab12747bee04"
+    user_id = "diaspora-cicd"
     grant_response = client.grant_user_access(topic, user_id)
     assert grant_response["status"] in ["success", "no-op"]
     assert "message" in grant_response

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

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