diff --git a/pkgs/clan-cli/clan_cli/tests/test_modules.py b/pkgs/clan-cli/clan_cli/tests/test_modules.py index 339887883..22860a45a 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_modules.py +++ b/pkgs/clan-cli/clan_cli/tests/test_modules.py @@ -27,7 +27,7 @@ from clan_lib.machines.machines import Machine as MachineMachine @pytest.mark.with_core def test_list_modules(test_flake_with_core: FlakeForTest) -> None: base_path = test_flake_with_core.path - modules_info = list_service_modules(str(base_path)) + modules_info = list_service_modules(Flake(str(base_path))) assert "modules" in modules_info diff --git a/pkgs/clan-cli/clan_lib/services/modules.py b/pkgs/clan-cli/clan_lib/services/modules.py index ee058905b..468ede8e4 100644 --- a/pkgs/clan-cli/clan_lib/services/modules.py +++ b/pkgs/clan-cli/clan_lib/services/modules.py @@ -158,11 +158,10 @@ class ModuleList(TypedDict): @API.register -def list_service_modules(base_path: str) -> ModuleList: +def list_service_modules(flake: Flake) -> ModuleList: """ Show information about a module """ - flake = Flake(base_path) modules = flake.select("clanInternals.inventoryClass.modulesPerSource") return ModuleList({"modules": modules}) diff --git a/pkgs/clan-cli/clan_lib/tests/test_create.py b/pkgs/clan-cli/clan_lib/tests/test_create.py index 26ecaa9c8..d31fd88d5 100644 --- a/pkgs/clan-cli/clan_lib/tests/test_create.py +++ b/pkgs/clan-cli/clan_lib/tests/test_create.py @@ -206,7 +206,7 @@ def test_clan_create_api( store = InventoryStore(clan_dir_flake) inventory = store.read() - modules = list_service_modules(str(clan_dir_flake.path)) + modules = list_service_modules(clan_dir_flake) assert ( modules["modules"]["clan-core"]["admin"]["manifest"]["name"] == "clan-core/admin"