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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.3.2
+Version: 0.3.5
 Summary: Diaspora Event Fabric SDK
 Home-page: https://github.com/globus-labs/diaspora-event-sdk
 License: Apache 2.0
@@ -21,6 +21,15 @@ License-File: LICENSE
 
 # Diaspora Event Fabric SDK
 
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/globus-labs/diaspora-event-sdk/main.svg)](https://results.pre-commit.ci/latest/github/globus-labs/diaspora-event-sdk/main)
+[![Tests](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/tests.yml/badge.svg)](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/tests.yml)
+[![Release](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/release.yml/badge.svg)](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/release.yml)
+[![GitHub Release](https://img.shields.io/github/v/release/globus-labs/diaspora-event-sdk?color=teal)](https://github.com/globus-labs/diaspora-event-sdk/releases)
+[![PyPI Version](https://img.shields.io/pypi/v/diaspora-event-sdk?color=teal)](https://pypi.org/project/diaspora-event-sdk/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Python Versions](https://img.shields.io/pypi/pyversions/diaspora-event-sdk.svg)](https://pypi.org/project/diaspora-event-sdk/)
+
+
 ## Installation Guide
 ### Recommended Method: With `kafka-python`
 To integrate with Diaspora Event Fabric using `KafkaProducer` and `KafkaConsumer`, install the SDK with `kafka-python`:

{diaspora-event-sdk-0.3.2 → diaspora-event-sdk-0.3.5}/README.md

@@ -1,5 +1,14 @@
 # Diaspora Event Fabric SDK
 
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/globus-labs/diaspora-event-sdk/main.svg)](https://results.pre-commit.ci/latest/github/globus-labs/diaspora-event-sdk/main)
+[![Tests](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/tests.yml/badge.svg)](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/tests.yml)
+[![Release](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/release.yml/badge.svg)](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/release.yml)
+[![GitHub Release](https://img.shields.io/github/v/release/globus-labs/diaspora-event-sdk?color=teal)](https://github.com/globus-labs/diaspora-event-sdk/releases)
+[![PyPI Version](https://img.shields.io/pypi/v/diaspora-event-sdk?color=teal)](https://pypi.org/project/diaspora-event-sdk/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Python Versions](https://img.shields.io/pypi/pyversions/diaspora-event-sdk.svg)](https://pypi.org/project/diaspora-event-sdk/)
+
+
 ## Installation Guide
 ### Recommended Method: With `kafka-python`
 To integrate with Diaspora Event Fabric using `KafkaProducer` and `KafkaConsumer`, install the SDK with `kafka-python`:

{diaspora-event-sdk-0.3.2 → diaspora-event-sdk-0.3.5}/diaspora_event_sdk/sdk/aws_iam_msk.py

@@ -114,11 +114,12 @@ def generate_auth_token(region, aws_debug_creds=False):
     # Load credentials
     import os
 
-    assert os.environ["AWS_ACCESS_KEY_ID"]
-    assert os.environ["AWS_SECRET_ACCESS_KEY"]
+    assert os.environ["OCTOPUS_AWS_ACCESS_KEY_ID"]
+    assert os.environ["OCTOPUS_AWS_SECRET_ACCESS_KEY"]
 
     aws_credentials = Credentials(
-        os.environ["AWS_ACCESS_KEY_ID"], os.environ["AWS_SECRET_ACCESS_KEY"]
+        os.environ["OCTOPUS_AWS_ACCESS_KEY_ID"],
+        os.environ["OCTOPUS_AWS_SECRET_ACCESS_KEY"],
     )
 
     return __construct_auth_token(region, aws_credentials)

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

@@ -26,15 +26,25 @@ def get_diaspora_config(extra_configs: Dict[str, Any] = {}) -> Dict[str, Any]:
     Retrieve default Diaspora event fabric connection configurations for Kafka clients.
     Merges default configurations with custom ones provided.
     """
+
+    bootstrap_servers = None
     try:
-        keys = Client().retrieve_key()
-        os.environ["AWS_ACCESS_KEY_ID"] = keys["access_key"]
-        os.environ["AWS_SECRET_ACCESS_KEY"] = keys["secret_key"]
+        if (
+            "OCTOPUS_AWS_ACCESS_KEY_ID" not in os.environ
+            and "OCTOPUS_AWS_SECRET_ACCESS_KEY" not in os.environ
+            and "OCTOPUS_BOOTSTRAP_SERVERS" not in os.environ
+        ):
+            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"]
     except Exception as e:
         raise RuntimeError("Failed to retrieve Kafka keys") from e
 
     conf = {
-        "bootstrap_servers": keys["endpoint"],
+        "bootstrap_servers": bootstrap_servers,
         "security_protocol": "SASL_SSL",
         "sasl_mechanism": "OAUTHBEARER",
         "api_version": (3, 5, 1),

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diaspora-event-sdk
-Version: 0.3.2
+Version: 0.3.5
 Summary: Diaspora Event Fabric SDK
 Home-page: https://github.com/globus-labs/diaspora-event-sdk
 License: Apache 2.0
@@ -21,6 +21,15 @@ License-File: LICENSE
 
 # Diaspora Event Fabric SDK
 
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/globus-labs/diaspora-event-sdk/main.svg)](https://results.pre-commit.ci/latest/github/globus-labs/diaspora-event-sdk/main)
+[![Tests](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/tests.yml/badge.svg)](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/tests.yml)
+[![Release](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/release.yml/badge.svg)](https://github.com/globus-labs/diaspora-event-sdk/actions/workflows/release.yml)
+[![GitHub Release](https://img.shields.io/github/v/release/globus-labs/diaspora-event-sdk?color=teal)](https://github.com/globus-labs/diaspora-event-sdk/releases)
+[![PyPI Version](https://img.shields.io/pypi/v/diaspora-event-sdk?color=teal)](https://pypi.org/project/diaspora-event-sdk/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Python Versions](https://img.shields.io/pypi/pyversions/diaspora-event-sdk.svg)](https://pypi.org/project/diaspora-event-sdk/)
+
+
 ## Installation Guide
 ### Recommended Method: With `kafka-python`
 To integrate with Diaspora Event Fabric using `KafkaProducer` and `KafkaConsumer`, install the SDK with `kafka-python`:

{diaspora-event-sdk-0.3.2 → diaspora-event-sdk-0.3.5}/tests/unit/apis_test.py

@@ -18,6 +18,9 @@ def setup():
     client_id = os.environ["DIASPORA_SDK_CLIENT_ID"]
     client_secret = os.environ["DIASPORA_SDK_CLIENT_SECRET"]
     requested_scopes = os.environ["CLIENT_SCOPE"]
+    # assert client_id
+    # assert client_secret
+    # assert requested_scopes
 
     ca = ConfidentialAppAuthClient(
         client_id=client_id,

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

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