From cf492b15aa476312367025823c34d87bb1bb31ed Mon Sep 17 00:00:00 2001
From: Louis Opter <louis@opter.org>
Date: Tue, 1 Oct 2024 19:41:51 -0700
Subject: [PATCH] Fix key dump in `clan secrets key show`

```
In [4]: str(Type.AGE)
Out[4]: Type.AGE

In [5]: Type.AGE.name.lower()
Out[5]: age
```
---
 pkgs/clan-cli/clan_cli/secrets/key.py  | 4 +---
 pkgs/clan-cli/clan_cli/secrets/sops.py | 7 +++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/secrets/key.py b/pkgs/clan-cli/clan_cli/secrets/key.py
index f471615d3..f41091d0e 100644
--- a/pkgs/clan-cli/clan_cli/secrets/key.py
+++ b/pkgs/clan-cli/clan_cli/secrets/key.py
@@ -60,9 +60,7 @@ def show_command(args: argparse.Namespace) -> None:
     if not key:
         msg = "No public key found"
         raise ClanError(msg)
-    json.dump(
-        {"key": key.pubkey, "type": str(key.key_type)}, sys.stdout, indent=2, sort_keys=True
-    )
+    json.dump(key.as_dict(), sys.stdout, indent=2, sort_keys=True)
 
 
 def update_command(args: argparse.Namespace) -> None:
diff --git a/pkgs/clan-cli/clan_cli/secrets/sops.py b/pkgs/clan-cli/clan_cli/secrets/sops.py
index dc85a3926..ad956ef3a 100644
--- a/pkgs/clan-cli/clan_cli/secrets/sops.py
+++ b/pkgs/clan-cli/clan_cli/secrets/sops.py
@@ -37,6 +37,13 @@ class SopsKey:
     username: str
     key_type: KeyType
 
+    def as_dict(self) -> dict[str, str]:
+        return {
+            "publickey": self.pubkey,
+            "username": self.username,
+            "type": self.key_type.name.lower(),
+        }
+
 
 def get_public_age_key(privkey: str) -> str:
     cmd = nix_shell(["nixpkgs#age"], ["age-keygen", "-y"])