[patch] Resolve master catalog

Author: unnati-solanki-git

src/mas/devops/data/__init__.py

@@ -29,9 +29,8 @@ def getCatalog(name: str) -> dict:
     Load a specific IBM Operator Catalog definition by name.
 
     This function reads a catalog YAML file from the catalogs directory and returns
-    its contents as a dictionary. Special handling for dev/master catalogs: if a catalog
-    doesn't exist and matches dev patterns (master, branch names), automatically resolves
-    to the newest catalog for that architecture.
+    its contents as a dictionary. Dev/master catalogs that don't exist will automatically
+    resolve to the newest catalog for that architecture.
 
     Args:
         name (str): The catalog name/tag (e.g., "v9-241205-amd64", "v8-240528-amd64", "v9-master-amd64").
@@ -59,6 +58,7 @@ def getCatalog(name: str) -> dict:
             is_dev_catalog = not (middle_part.isdigit() and len(middle_part) == 6)
 
             if is_dev_catalog:
+                # This is a dev catalog, resolve to newest catalog for this architecture
                 try:
                     newestCatalog = getNewestCatalogTag(arch)
                     catalogFileName = f"{newestCatalog}.yaml"

test/src/test_data.py

@@ -43,3 +43,27 @@ def test_get_newest_catalog_tag_fail():
 def test_get_catalog_fail():
     with pytest.raises(NoSuchCatalogError, match="Catalog nonexistent-catalog is unknown"):
         getCatalog("nonexistent-catalog")
+
+
+def test_get_dev_catalog_master():
+    """Test that master dev catalogs automatically resolve to newest catalog"""
+    catalogData = getCatalog("v9-master-amd64")
+    # Should resolve to newest catalog
+    newestCatalog = getCatalog(getNewestCatalogTag("amd64"))
+    assert catalogData == newestCatalog
+
+
+def test_get_dev_catalog_branch():
+    """Test that branch dev catalogs automatically resolve to newest catalog"""
+    catalogData = getCatalog("v9-feature-branch-amd64")
+    # Should resolve to newest catalog
+    newestCatalog = getCatalog(getNewestCatalogTag("amd64"))
+    assert catalogData == newestCatalog
+
+
+def test_get_dev_catalog_s390x():
+    """Test that dev catalogs work for different architectures"""
+    catalogData = getCatalog("v9-master-s390x")
+    # Should resolve to newest s390x catalog
+    newestCatalog = getCatalog(getNewestCatalogTag("s390x"))
+    assert catalogData == newestCatalog