parse snap info as yaml

charmed-kubernetes · Jan 3, 2024 · 38ccf1f · 38ccf1f
1 parent abe395e
commit 38ccf1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/charms/kubernetes_snaps.py b/charms/kubernetes_snaps.py
@@ -671,12 +671,10 @@ def is_channel_available(snap_name: str, target_channel: str) -> bool:
     """
     cmd = ["snap", "info", snap_name]
     result = check_output(cmd)
-    output = result.decode().strip()
-    for line in output.splitlines():
-        if target_channel in line:
-            match = re.search(r"\s+\(\d+\)\s+", line)
-            return bool(match)
-    return False
+    output = yaml.safe_load(result.decode())
+    channels = output.get("channels") or ()
+    target = channels.get(target_channel) or None
+    return target and target != "--"
 
 
 def is_snap_installed(snap_name) -> bool:

diff --git a/tests/unit/test_kubernetes_snaps.py b/tests/unit/test_kubernetes_snaps.py
@@ -42,7 +42,7 @@ def test_is_snap_available(subprocess_check_output):
 name:      my-snap
 publisher: Canonical✓
 channels:
-  latest/stable:    -
+  latest/stable:    --
   1.29/stable:   1.29.0  2024-01-03 (22606) 12MB -
 """
     subprocess_check_output.return_value = snap_info.encode()