Revert "vars: retrieve generators for multiple machines"

This reverts commit 501d020562.

pkgs/clan-app/ui/src/hooks/queries.ts

@@ -456,14 +456,12 @@ export const useMachineGenerators = (
     ],
     queryFn: async () => {
       const call = client.fetch("get_generators", {
-        machines: [
+        machine: {
-          {
+          name: machineName,
-            name: machineName,
+          flake: {
-            flake: {
+            identifier: clanUri,
-              identifier: clanUri,
-            },
           },
-        ],
+        },
         full_closure: true, // TODO: Make this configurable
         // TODO: Make this configurable
         include_previous_values: true,

pkgs/clan-cli/clan_cli/tests/test_vars.py

@@ -862,7 +862,7 @@ def test_api_set_prompts(
 
     machine = Machine(name="my_machine", flake=Flake(str(flake.path)))
     generators = get_generators(
-        machines=[machine],
+        machine=machine,
         full_closure=True,
         include_previous_values=True,
     )

pkgs/clan-cli/clan_cli/vars/check.py

@@ -41,7 +41,7 @@ def vars_status(
     unfixed_secret_vars = []
     invalid_generators = []
 
-    generators = Generator.get_machine_generators([machine.name], machine.flake)
+    generators = Generator.get_machine_generators(machine.name, machine.flake)
     if generator_name:
         for generator in generators:
             if generator_name == generator.name:

pkgs/clan-cli/clan_cli/vars/list.py

@@ -19,7 +19,7 @@ def get_machine_vars(machine: Machine) -> list[Var]:
 
     all_vars = []
 
-    generators = get_generators(machines=[machine], full_closure=True)
+    generators = get_generators(machine=machine, full_closure=True)
     for generator in generators:
         for var in generator.files:
             if var.secret:

pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py

@@ -56,7 +56,7 @@ class SecretStore(StoreBase):
         # no need to generate keys if we don't manage secrets
         from clan_cli.vars.generator import Generator  # noqa: PLC0415
 
-        vars_generators = Generator.get_machine_generators([machine], self.flake)
+        vars_generators = Generator.get_machine_generators(machine, self.flake)
         if not vars_generators:
             return
         has_secrets = False
@@ -143,7 +143,7 @@ class SecretStore(StoreBase):
         if generators is None:
             from clan_cli.vars.generator import Generator  # noqa: PLC0415
 
-            generators = Generator.get_machine_generators([machine], self.flake)
+            generators = Generator.get_machine_generators(machine, self.flake)
         file_found = False
         outdated = []
         for generator in generators:
@@ -220,7 +220,7 @@ class SecretStore(StoreBase):
     def populate_dir(self, machine: str, output_dir: Path, phases: list[str]) -> None:
         from clan_cli.vars.generator import Generator  # noqa: PLC0415
 
-        vars_generators = Generator.get_machine_generators([machine], self.flake)
+        vars_generators = Generator.get_machine_generators(machine, self.flake)
         if "users" in phases or "services" in phases:
             key_name = f"{machine}-age.key"
             if not has_secret(sops_secrets_folder(self.flake.path) / key_name):
@@ -356,7 +356,7 @@ class SecretStore(StoreBase):
         if generators is None:
             from clan_cli.vars.generator import Generator  # noqa: PLC0415
 
-            generators = Generator.get_machine_generators([machine], self.flake)
+            generators = Generator.get_machine_generators(machine, self.flake)
         file_found = False
         for generator in generators:
             for file in generator.files:

pkgs/clan-cli/clan_lib/tests/test_create.py

@@ -230,7 +230,7 @@ def test_clan_create_api(
     # Invalidate cache because of new inventory
     clan_dir_flake.invalidate_cache()
 
-    generators = get_generators(machines=[machine], full_closure=True)
+    generators = get_generators(machine=machine, full_closure=True)
     collected_prompt_values = {}
     for generator in generators:
         prompt_values = {}