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

13
pkgs/clan-cli/clan_cli/secrets/key.py
View File

@@ -13,15 +13,16 @@ from .sops import (
default_admin_private_key_path,
generate_private_key,
load_age_plugins,
maybe_get_admin_public_key,
maybe_get_admin_public_keys,
)
log = logging.getLogger(__name__)
def generate_key() -> sops.SopsKey:
key = maybe_get_admin_public_key()
if key is not None:
keys = maybe_get_admin_public_keys()
if keys is not None:
key = keys[0]
print(f"{key.key_type.name} key {key.pubkey} is already set", file=sys.stderr)
return key
@@ -44,11 +45,11 @@ def generate_command(args: argparse.Namespace) -> None:
def show_command(args: argparse.Namespace) -> None:
key = sops.maybe_get_admin_public_key()
if not key:
keys = sops.maybe_get_admin_public_keys()
if not keys:
msg = "No public key found"
raise ClanError(msg)
json.dump(key.as_dict(), sys.stdout, indent=2, sort_keys=True)
json.dump([key.as_dict() for key in keys], sys.stdout, indent=2, sort_keys=True)
def update_command(args: argparse.Namespace) -> None: