remotivelabs-cli 0.3.4__tar.gz → 0.3.5__tar.gz

{remotivelabs_cli-0.3.4 → remotivelabs_cli-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: remotivelabs-cli
-Version: 0.3.4
+Version: 0.3.5
 Summary: CLI for operating RemotiveCloud and RemotiveBroker
 Author: Johan Rask
 Author-email: johan.rask@remotivelabs.com

{remotivelabs_cli-0.3.4 → remotivelabs_cli-0.3.5}/cli/broker/signals.py

@@ -198,7 +198,7 @@ def namespaces(
 
 @app.command()
 def frame_distribution(
-    url: str = typer.Option(..., help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
+    url: str = typer.Option(DEFAULT_GRPC_URL, help="Broker URL", envvar="REMOTIVE_BROKER_URL"),
     api_key: str = typer.Option(None, help="Cloud Broker API-KEY or access token", envvar="REMOTIVE_BROKER_API_KEY"),
     namespace: str = typer.Option(..., help="Namespace"),
 ) -> None:

{remotivelabs_cli-0.3.4 → remotivelabs_cli-0.3.5}/cli/settings/core.py

@@ -22,6 +22,10 @@ CONFIG_DIR_PATH = Path.home() / ".config" / "remotive"
 CLI_CONFIG_FILE_NAME = "config.json"
 CLI_INTERNAL_STATE_FILE_NAME = "app-state.json"
 
+TOKEN_ENV = "REMOTIVE_CLOUD_AUTH_TOKEN"
+# Deprecated in favour of name used in topology-cli
+DEPR_TOKEN_ENV = "REMOTIVE_CLOUD_ACCESS_TOKEN"
+
 
 class InvalidSettingsFilePathError(Exception):
     """Raised when trying to access an invalid settings file or file path"""
@@ -91,8 +95,15 @@ class Settings:
 
     def get_active_token(self) -> str | None:
         """
-        Get the token secret for the current active account
+        Get the token secret for the current active account or token specified by env variable
         """
+
+        token = os.environ[DEPR_TOKEN_ENV] if DEPR_TOKEN_ENV in os.environ else None
+        if not token:
+            token = os.environ[TOKEN_ENV] if TOKEN_ENV in os.environ else None
+        if token:
+            return token
+
         token_file = self.get_active_token_file()
         return token_file.token if token_file else None
 

{remotivelabs_cli-0.3.4 → remotivelabs_cli-0.3.5}/cli/utils/rest_helper.py

@@ -85,6 +85,7 @@ class RestHelper:
         TODO: remove setting org, as we already set the default organization as env in remotive.py?
         TODO: don't sys.exit, raise error instead
         """
+
         if "REMOTIVE_CLOUD_ORGANIZATION" not in os.environ:
             active_account = settings.get_active_account()
             if active_account:
@@ -94,7 +95,8 @@ class RestHelper:
 
         token = access_token
         if not token:
-            token = os.environ.get("REMOTIVE_CLOUD_ACCESS_TOKEN", settings.get_active_token())
+            token = settings.get_active_token()
+
             if not token:
                 if quiet:
                     return

{remotivelabs_cli-0.3.4 → remotivelabs_cli-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remotivelabs-cli"
-version = "0.3.4"
+version = "0.3.5"
 description = "CLI for operating RemotiveCloud and RemotiveBroker"
 authors = ["Johan Rask <johan.rask@remotivelabs.com>"]
 readme = "README.md"