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

sops: fix compatibility with new format

Browse Source 
The new format can have null values now.
This commit is contained in:
Jörg Thalheim
2025-04-08 17:44:12 +02:00
parent ba69a8a860
commit be37194b9a
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,15 +449,20 @@ def decrypt_file(secret_path: Path) -> str:
def get_recipients(secret_path: Path) -> set[SopsKey]: def get_recipients(secret_path: Path) -> set[SopsKey]:
sops_attrs = json.loads((secret_path / "secret").read_text())["sops"] sops_attrs = json.loads((secret_path / "secret").read_text())["sops"]
return { keys = set()
SopsKey( for key_type in KeyType:
pubkey=recipient[key_type.sops_recipient_attr], recipients = sops_attrs.get(key_type.name.lower())
username="", if not recipients:
key_type=key_type, continue
) for recipient in recipients:
for key_type in KeyType keys.add(
for recipient in sops_attrs[key_type.name.lower()] or [] SopsKey(
} pubkey=recipient[key_type.sops_recipient_attr],
username="",
key_type=key_type,
)
)
return keys
def get_meta(secret_path: Path) -> dict: def get_meta(secret_path: Path) -> dict: