Added flake_name:str argument everywhere, nix fmt doesn't complain anymore

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

@@ -11,20 +11,20 @@ from .types import (
 )
 
 
-def add_user(name: str, key: str, force: bool) -> None:
-    write_key(sops_users_folder() / name, key, force)
+def add_user(flake_name: str, name: str, key: str, force: bool) -> None:
+    write_key(sops_users_folder(flake_name) / name, key, force)
 
 
-def remove_user(name: str) -> None:
-    remove_object(sops_users_folder(), name)
+def remove_user(flake_name: str, name: str) -> None:
+    remove_object(sops_users_folder(flake_name), name)
 
 
-def get_user(name: str) -> str:
-    return read_key(sops_users_folder() / name)
+def get_user(flake_name: str, name: str) -> str:
+    return read_key(sops_users_folder(flake_name) / name)
 
 
-def list_users() -> list[str]:
-    path = sops_users_folder()
+def list_users(flake_name: str) -> list[str]:
+    path = sops_users_folder(flake_name)
 
     def validate(name: str) -> bool:
         return (
@@ -35,38 +35,40 @@ def list_users() -> list[str]:
     return list_objects(path, validate)
 
 
-def add_secret(user: str, secret: str) -> None:
-    secrets.allow_member(secrets.users_folder(secret), sops_users_folder(), user)
+def add_secret(flake_name: str, user: str, secret: str) -> None:
+    secrets.allow_member(
+        secrets.users_folder(flake_name, secret), sops_users_folder(flake_name), user
+    )
 
 
-def remove_secret(user: str, secret: str) -> None:
-    secrets.disallow_member(secrets.users_folder(secret), user)
+def remove_secret(flake_name: str, user: str, secret: str) -> None:
+    secrets.disallow_member(secrets.users_folder(flake_name, secret), user)
 
 
 def list_command(args: argparse.Namespace) -> None:
-    lst = list_users()
+    lst = list_users(args.flake)
     if len(lst) > 0:
         print("\n".join(lst))
 
 
 def add_command(args: argparse.Namespace) -> None:
-    add_user(args.user, args.key, args.force)
+    add_user(args.flake, args.user, args.key, args.force)
 
 
 def get_command(args: argparse.Namespace) -> None:
-    print(get_user(args.user))
+    print(get_user(args.flake, args.user))
 
 
 def remove_command(args: argparse.Namespace) -> None:
-    remove_user(args.user)
+    remove_user(args.flake, args.user)
 
 
 def add_secret_command(args: argparse.Namespace) -> None:
-    add_secret(args.user, args.secret)
+    add_secret(args.flake, args.user, args.secret)
 
 
 def remove_secret_command(args: argparse.Namespace) -> None:
-    remove_secret(args.user, args.secret)
+    remove_secret(args.flake, args.user, args.secret)
 
 
 def register_users_parser(parser: argparse.ArgumentParser) -> None:
@@ -77,6 +79,11 @@ def register_users_parser(parser: argparse.ArgumentParser) -> None:
         required=True,
     )
     list_parser = subparser.add_parser("list", help="list users")
+    list_parser.add_argument(
+        "flake",
+        type=str,
+        help="name of the flake to create machine for",
+    )
     list_parser.set_defaults(func=list_command)
 
     add_parser = subparser.add_parser("add", help="add a user")
@@ -90,14 +97,29 @@ def register_users_parser(parser: argparse.ArgumentParser) -> None:
         type=public_or_private_age_key_type,
     )
     add_parser.set_defaults(func=add_command)
+    add_parser.add_argument(
+        "flake",
+        type=str,
+        help="name of the flake to create machine for",
+    )
 
     get_parser = subparser.add_parser("get", help="get a user public key")
     get_parser.add_argument("user", help="the name of the user", type=user_name_type)
     get_parser.set_defaults(func=get_command)
+    get_parser.add_argument(
+        "flake",
+        type=str,
+        help="name of the flake to create machine for",
+    )
 
     remove_parser = subparser.add_parser("remove", help="remove a user")
     remove_parser.add_argument("user", help="the name of the user", type=user_name_type)
     remove_parser.set_defaults(func=remove_command)
+    remove_parser.add_argument(
+        "flake",
+        type=str,
+        help="name of the flake to create machine for",
+    )
 
     add_secret_parser = subparser.add_parser(
         "add-secret", help="allow a user to access a secret"