feat: when checking EOL tags check for digit

src/image/release.py

@@ -56,21 +56,25 @@ def remove_eol_tags(tag_to_revision, all_releases):
 
     filtered_tag_to_revision = tag_to_revision.copy()
     for base_tag, _ in tag_to_revision.items():
-
         path = []  # track revisions to prevent inf loop
         tag = base_tag  # init state
         while True:
-
             if tag in path:
                 raise shared.BadChannel(
                     f"Circular tracks found in release JSON:\n {all_releases}"
                 )
 
             path.append(tag)
 
+            # if we find a numeric revision, break since we reached the end of the path
+            if tag.isdigit():
+                break
+
             # we allways expect len == 2 unless we reach the final numeric tag
             if not len(split := tag.split("_")) == 2:
-                break
+                raise shared.BadChannel(
+                    f"Malformed tag. Expected format is <track>_<risk>. Found tag: {tag}."
+                )
 
             track, risk = split
 
@@ -85,7 +89,6 @@ def remove_eol_tags(tag_to_revision, all_releases):
                 < execution_timestamp
                 and base_tag in filtered_tag_to_revision
             ):
-
                 print(f"Warning: Removing EOL tag {repr(base_tag)}, date: {eol_date}")
                 filtered_tag_to_revision.pop(base_tag)
 
@@ -96,7 +99,6 @@ def remove_eol_tags(tag_to_revision, all_releases):
 
 
 def main():
-
     args = parser.parse_args()
     img_name = (
         args.image_name

tests/unit/test_release.py

@@ -19,6 +19,17 @@ def test_remove_eol_tags_no_change(release_json):
     assert revision_to_tag == result, "No change should have occured"
 
 
+def test_remove_eol_tags_malformed_tag(release_json):
+    """Ensure malformed tag raises BadChannel exception."""
+
+    revision_to_tag = {
+        "malformed-tag": "1033",
+    }
+
+    with pytest.raises(shared.BadChannel):
+        remove_eol_tags(revision_to_tag, release_json)
+
+
 def test_remove_eol_tags(release_json):
     """Ensure EOL tags are removed."""