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

Merge pull request 'secrets: improve error messages' (#208) from Mic92-main into main

Browse Source
This commit is contained in:
clan-bot
2023-08-29 14:22:29 +00:00
parent 754bfee3fd 9b3bfd6950
commit 18bc6c7345
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/clan-cli/clan_cli/secrets/sops.py
View File

@@ -22,9 +22,12 @@ class SopsKey:
def get_public_key(privkey: str) -> str: def get_public_key(privkey: str) -> str:
cmd = nix_shell(["age"], ["age-keygen", "-y"]) cmd = nix_shell(["age"], ["age-keygen", "-y"])
res = subprocess.run( try:
cmd, input=privkey, check=True, stdout=subprocess.PIPE, text=True res = subprocess.run(cmd, input=privkey, stdout=subprocess.PIPE, text=True)
) except subprocess.CalledProcessError as e:
raise ClanError(
"Failed to get public key for age private key. Is the key malformed?"
) from e
return res.stdout.strip() return res.stdout.strip()
@@ -100,7 +103,7 @@ def ensure_sops_key() -> SopsKey:
subprocess.run(cmd, check=True) subprocess.run(cmd, check=True)
tty.info( tty.info(
f"Generated age key at '{path}'. Please back it up on a secure location or you will lose access to your secrets." f"Generated age key at '{path}' for your user. Please back it up on a secure location or you will lose access to your secrets."
) )
return ensure_user(get_public_key(path.read_text())) return ensure_user(get_public_key(path.read_text()))