yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cli: don't error when more than one SOPS key found locally

Browse Source
This commit is contained in:
Michael Hoang
2025-06-12 16:18:46 +07:00
parent 41822097c7
commit 6b4df65412
5 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/clan-cli/clan_cli/vars/keygen.py
View File

@@ -4,7 +4,7 @@ import os
from pathlib import Path
from clan_cli.secrets.key import generate_key
from clan_cli.secrets.sops import maybe_get_admin_public_key
from clan_cli.secrets.sops import maybe_get_admin_public_keys
from clan_cli.secrets.users import add_user
from clan_lib.api import API
from clan_lib.errors import ClanError
@@ -19,14 +19,14 @@ def keygen(flake_dir: Path, user: str | None = None, force: bool = False) -> Non
if not user:
msg = "No user provided and $USER is not set. Please provide a user via --user."
raise ClanError(msg)
pub_key = maybe_get_admin_public_key()
if not pub_key:
pub_key = generate_key()
pub_keys = maybe_get_admin_public_keys()
if not pub_keys:
pub_keys = [generate_key()]
# TODO set flake_dir=flake.path / "vars"
add_user(
flake_dir=flake_dir,
name=user,
keys=[pub_key],
keys=pub_keys,
force=force,
)