fedn config - to see env:s set

fedn/cli/__init__.py

@@ -1,5 +1,6 @@
 from .client_cmd import client_cmd  # noqa: F401
 from .combiner_cmd import combiner_cmd  # noqa: F401
+from .config_cmd import config_cmd  # noqa: F401
 from .main import main  # noqa: F401
 from .model_cmd import model_cmd  # noqa: F401
 from .package_cmd import package_cmd  # noqa: F401

fedn/cli/config_cmd.py

@@ -0,0 +1,54 @@
+import os
+
+import click
+
+from .main import main
+
+envs = [
+    {
+        "name": "FEDN_CONTROLLER_PROTOCOL",
+        "description": "The protocol to use for communication with the controller."
+    },
+    {
+        "name": "FEDN_CONTROLLER_HOST",
+        "description": "The host to use for communication with the controller."
+    },
+    {
+        "name": "FEDN_CONTROLLER_PORT",
+        "description": "The port to use for communication with the controller."
+    },
+    {
+        "name": "FEDN_AUTH_TOKEN",
+        "description": "The authentication token to use for communication with the controller and combiner."
+    },
+    {
+        "name": "FEDN_AUTH_SCHEME",
+        "description": "The authentication scheme to use for communication with the controller and combiner."
+    },
+    {
+        "name": "FEDN_CONTROLLER_URL",
+        "description": "The URL of the controller. Overrides FEDN_CONTROLLER_PROTOCOL, FEDN_CONTROLLER_HOST and FEDN_CONTROLLER_PORT."
+    },
+    {
+        "name": "FEDN_PACKAGE_EXTRACT_DIR",
+        "description": "The directory to extract packages to."
+    }
+]
+
+
+@main.group('config', invoke_without_command=True)
+@click.pass_context
+def config_cmd(ctx):
+    """
+    - Configuration commands for the FEDn CLI.
+    """
+    if ctx.invoked_subcommand is None:
+        click.echo('\n--- FEDn Cli Configuration ---\n')
+        click.echo('Current configuration:\n')
+
+        for env in envs:
+            name = env['name']
+            value = os.environ.get(name)
+            click.echo(f'{name}: {value or "Not set"}')
+            click.echo(f'{env["description"]}\n')
+        click.echo('\n')

fedn/cli/shared.py

@@ -53,15 +53,15 @@ def get_api_url(protocol: str, host: str, port: str, endpoint: str) -> str:
     if _url:
         return f'{_url}/api/{API_VERSION}/{endpoint}'
 
-    _protocol = protocol or os.environ.get('FEDN_PROTOCOL') or CONTROLLER_DEFAULTS['protocol']
-    _host = host or os.environ.get('FEDN_HOST') or CONTROLLER_DEFAULTS['host']
-    _port = port or os.environ.get('FEDN_PORT') or CONTROLLER_DEFAULTS['port']
+    _protocol = protocol or os.environ.get('FEDN_CONTROLLER_PROTOCOL') or CONTROLLER_DEFAULTS['protocol']
+    _host = host or os.environ.get('FEDN_CONTROLLER_HOST') or CONTROLLER_DEFAULTS['host']
+    _port = port or os.environ.get('FEDN_CONTROLLER_PORT') or CONTROLLER_DEFAULTS['port']
 
     return f'{_protocol}://{_host}:{_port}/api/{API_VERSION}/{endpoint}'
 
 
 def get_token(token: str) -> str:
-    _token = token or os.environ.get("FEDN_TOKEN", None)
+    _token = token or os.environ.get("FEDN_AUTH_TOKEN", None)
 
     if _token is None:
         return None