fixed cli

Author: Andrei Neagu

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/cli.py

@@ -3,6 +3,7 @@
 
 import typer
 from settings_library.docker_api_proxy import DockerApiProxysettings
+from settings_library.postgres import PostgresSettings
 from settings_library.rabbit import RabbitSettings
 from settings_library.utils_cli import (
     create_settings_command,
@@ -49,14 +50,29 @@ def echo_dotenv(ctx: typer.Context, *, minimal: bool = True):
                 RABBIT_SECURE=os.environ.get("RABBIT_SECURE", "0"),
                 RABBIT_USER=os.environ.get("RABBIT_USER", "replace-with-rabbit-user"),
                 RABBIT_PASSWORD=os.environ.get(
-                    "RABBIT_PASSWORD", "replace-with-rabbit-user"
+                    "RABBIT_PASSWORD", "replace-with-rabbit-password"
                 ),
             ),
         ),
         DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=os.environ.get(
             "DYNAMIC_SCHEDULER_UI_STORAGE_SECRET",
             "replace-with-ui-storage-secret",
         ),
+        DYNAMIC_SCHEDULER_POSTGRES=os.environ.get(
+            "DYNAMIC_SCHEDULER_POSTGRES",
+            PostgresSettings.create_from_envs(
+                POSTGRES_HOST=os.environ.get(
+                    "POSTGRES_HOST", "replace-with-postgres-host"
+                ),
+                POSTGRES_USER=os.environ.get(
+                    "POSTGRES_USER", "replace-with-postgres-user"
+                ),
+                POSTGRES_PASSWORD=os.environ.get(
+                    "POSTGRES_PASSWORD", "replace-with-postgres-password"
+                ),
+                POSTGRES_DB=os.environ.get("POSTGRES_DB", "replace-with-postgres-db"),
+            ),
+        ),
         DYNAMIC_SCHEDULER_DOCKER_API_PROXY=os.environ.get(
             "DYNAMIC_SCHEDULER_DOCKER_API_PROXY",
             DockerApiProxysettings.create_from_envs(

services/dynamic-scheduler/tests/conftest.py

@@ -27,6 +27,7 @@
     "pytest_simcore.environment_configs",
     "pytest_simcore.faker_projects_data",
     "pytest_simcore.faker_users_data",
+    "pytest_simcore.postgres_service",
     "pytest_simcore.rabbit_service",
     "pytest_simcore.redis_service",
     "pytest_simcore.repository_paths",

services/dynamic-scheduler/tests/unit/test_cli.py

@@ -1,3 +1,4 @@
+# pylint:disable=redefined-outer-name
 # pylint:disable=unused-argument
 
 import os
@@ -29,7 +30,9 @@ def test_cli_help_and_version(cli_runner: CliRunner):
     assert result.stdout.strip() == API_VERSION
 
 
-def test_echo_dotenv(cli_runner: CliRunner, monkeypatch: pytest.MonkeyPatch):
+def test_echo_dotenv(
+    app_environment: EnvVarsDict, cli_runner: CliRunner, monkeypatch: pytest.MonkeyPatch
+):
     # simcore-service-dynamic-scheduler echo-dotenv
     result = cli_runner.invoke(cli_main, "echo-dotenv")
     assert result.exit_code == os.EX_OK, _format_cli_error(result)
@@ -38,35 +41,29 @@ def test_echo_dotenv(cli_runner: CliRunner, monkeypatch: pytest.MonkeyPatch):
 
     with monkeypatch.context() as patch:
         setenvs_from_dict(patch, environs)
-        assert ApplicationSettings.create_from_envs()
+        ApplicationSettings.create_from_envs()
+
+
+def _get_default_environs(cli_runner: CliRunner) -> EnvVarsDict:
+    result = cli_runner.invoke(cli_main, "echo-dotenv")
+    assert result.exit_code == os.EX_OK, _format_cli_error(result)
+    return load_dotenv(result.stdout)
 
 
 def test_list_settings(
     cli_runner: CliRunner, app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatch
 ):
     with monkeypatch.context() as patch:
-        setenvs_from_dict(
-            patch,
-            {
-                **app_environment,
-                "DYNAMIC_SCHEDULER_TRACING": "{}",
-                "TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT": "http://replace-with-opentelemetry-collector",
-                "TRACING_OPENTELEMETRY_COLLECTOR_PORT": "4318",
-            },
-        )
+        setenvs_from_dict(patch, _get_default_environs(cli_runner))
 
         # simcore-service-dynamic-scheduler settings --show-secrets --as-json
         result = cli_runner.invoke(
             cli_main, ["settings", "--show-secrets", "--as-json"]
         )
         assert result.exit_code == os.EX_OK, _format_cli_error(result)
 
-    print(result.output)
-    settings = ApplicationSettings(result.output)
-    assert settings.model_dump() == ApplicationSettings.create_from_envs().model_dump()
-
-
-def test_main(app_environment: EnvVarsDict):
-    from simcore_service_dynamic_scheduler.main import the_app
-
-    assert the_app
+        print(result.output)
+        settings = ApplicationSettings(result.output)
+        assert (
+            settings.model_dump() == ApplicationSettings.create_from_envs().model_dump()
+        )