Fixing a multitude of tests

pkgs/clan-cli/clan_cli/secrets/generate.py

@@ -8,18 +8,19 @@ from clan_cli.errors import ClanError
 
 from ..dirs import specific_flake_dir
 from ..machines.machines import Machine
+from ..types import FlakeName
 
 log = logging.getLogger(__name__)
 
 
-def generate_secrets(machine: Machine) -> None:
+def generate_secrets(machine: Machine, flake_name: FlakeName) -> None:
     env = os.environ.copy()
     env["CLAN_DIR"] = str(machine.flake_dir)
     env["PYTHONPATH"] = ":".join(sys.path)  # TODO do this in the clanCore module
 
     print(f"generating secrets... {machine.generate_secrets}")
     proc = subprocess.run(
-        [machine.generate_secrets],
+        [machine.generate_secrets, flake_name],
         env=env,
     )
 
@@ -31,7 +32,7 @@ def generate_secrets(machine: Machine) -> None:
 
 def generate_command(args: argparse.Namespace) -> None:
     machine = Machine(name=args.machine, flake_dir=specific_flake_dir(args.flake))
-    generate_secrets(machine)
+    generate_secrets(machine, args.flake)
 
 
 def register_generate_parser(parser: argparse.ArgumentParser) -> None:

pkgs/clan-cli/clan_cli/secrets/import_sops.py

@@ -91,4 +91,10 @@ def register_import_sops_parser(parser: argparse.ArgumentParser) -> None:
         type=str,
         help="the sops file to import (- for stdin)",
     )
+    parser.add_argument(
+        "flake",
+        type=str,
+        help="name of the flake",
+    )
+
     parser.set_defaults(func=import_sops)