Add support to read existing flavors.yaml with gl-flavors-parse

Signed-off-by: Tobias Wolf <[email protected]>

Author: NotTheEvilOne

src/python_gardenlinux_lib/flavors/parse_flavors.py

@@ -29,6 +29,26 @@ def find_repo_root():
 
     return Git(".").rev_parse("--show-superproject-working-tree")
 
+def _get_flavors_from_github(commit):
+    """Returns the flavors.yaml from GitHub if readable."""
+
+    # Try flavors.yaml first
+    api_path = "/repos/gardenlinux/gardenlinux/contents/flavors.yaml"
+    if commit != "latest":
+        api_path = f"{api_path}?ref={commit}"
+    command = ["gh", "api", api_path]
+    logger.debug(f"Fetching flavors.yaml from GitHub for commit {commit_short}")
+    result = subprocess.run(
+        command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
+    )
+
+    if result.returncode == 0:
+        content_data = json.loads(result.stdout)
+        return base64.b64decode(content_data["content"]).decode("utf-8")
+    else:
+        raise RuntimeError("Failed receiving result from GitHub: {0}".format(result.stderr))
+
+
 def parse_flavors_commit(
     commit=None,
     version=None,
@@ -65,13 +85,6 @@ def parse_flavors_commit(
     Returns:
         list: List of flavor strings, or empty list if no flavors found
     """
-    try:
-        version_info = (
-            f"{version['major']}.{version.get('minor', 0)}" if version else "unknown"
-        )
-        if commit is None:
-            commit = "latest"
-        commit_short = commit[:8]
 
     if logger is None:
         logger = logging.getLogger("gardenlinux.lib.flavors")
@@ -113,99 +126,65 @@ def parse_flavors_commit(
             exclude_categories=exclude_categories or [],
         )
 
-        # Try flavors.yaml first
-        api_path = "/repos/gardenlinux/gardenlinux/contents/flavors.yaml"
-        if commit != "latest":
-            api_path = f"{api_path}?ref={commit}"
-        command = ["gh", "api", api_path]
-        logger.debug(f"Fetching flavors.yaml from GitHub for commit {commit_short}")
-        result = subprocess.run(
-            command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
-        )
-
-        if result.returncode == 0:
-            content_data = json.loads(result.stdout)
-            yaml_content = base64.b64decode(content_data["content"]).decode("utf-8")
-            flavors_data = yaml.safe_load(yaml_content)
-
-            # Parse flavors with all filters
-            combinations = parse_flavors_data(
-                flavors_data,
-                include_only_patterns=include_only_patterns or [],
-                wildcard_excludes=wildcard_excludes or [],
-                only_build=only_build,
-                only_test=only_test,
-                only_test_platform=only_test_platform,
-                only_publish=only_publish,
-                filter_categories=filter_categories or [],
-                exclude_categories=exclude_categories or [],
+        all_flavors = set()
+        for _, combination in combinations:
+            all_flavors.add(combination)
+
+        if all_flavors:
+            logger.info(f"Found {len(all_flavors)} flavors in flavors.yaml")
+            return sorted(all_flavors)
+        else:
+            logger.info("No flavors found in flavors.yaml")
+    elif query_s3 and s3_objects and isinstance(s3_objects, dict):
+        logger.debug("Checking S3 artifacts")
+        index = s3_objects.get("index", {})
+        artifacts = s3_objects.get("artifacts", [])
+
+        # Try index lookup first
+        search_key = f"{version_info}-{commit_short}"
+        if search_key in index:
+            flavors = index[search_key]
+            logger.debug(f"Found flavors in S3 index for {search_key}")
+        else:
+            # If no index match, search through artifacts
+            found_flavors = set()
+
+            # Search for artifacts matching version and commit
+            for key in artifacts:
+                if version_info in key and commit_short in key:
+                    try:
+                        parts = key.split("/")
+                        if len(parts) >= 2:
+                            flavor_with_version = parts[1]
+                            flavor = flavor_with_version.rsplit(
+                                "-" + version_info, 1
+                            )[0]
+                            if flavor:
+                                found_flavors.add(flavor)
+                    except Exception as e:
+                        logger.debug(f"Error parsing artifact key {key}: {e}")
+                        continue
+
+            flavors = list(found_flavors)
+
+        # Apply filters to S3 flavors
+        filtered_flavors = []
+        for flavor in flavors:
+            # Create a dummy combination with amd64 architecture for filtering
+            combination = ("amd64", flavor)
+            if should_include_only(
+                flavor, include_only_patterns or []
+            ) and not should_exclude(flavor, wildcard_excludes or [], []):
+                filtered_flavors.append(flavor)
+
+        if filtered_flavors:
+            logger.info(
+                f"Found {len(filtered_flavors)} flavors in S3 artifacts after filtering"
+            )
+            return sorted(filtered_flavors)
+        else:
+            logger.info(
+                f"No flavors found in S3 for version {version_info} and commit {commit_short} after filtering"
             )
 
-            all_flavors = set()
-            for _, combination in combinations:
-                all_flavors.add(combination)
-
-            if all_flavors:
-                logger.info(f"Found {len(all_flavors)} flavors in flavors.yaml")
-                return sorted(all_flavors)
-            else:
-                logger.info("No flavors found in flavors.yaml")
-
-        # If no flavors.yaml found and query_s3 is enabled, try S3 artifacts
-        if query_s3 and s3_objects and isinstance(s3_objects, dict):
-            logger.debug("Checking S3 artifacts")
-            index = s3_objects.get("index", {})
-            artifacts = s3_objects.get("artifacts", [])
-
-            # Try index lookup first
-            search_key = f"{version_info}-{commit_short}"
-            if search_key in index:
-                flavors = index[search_key]
-                logger.debug(f"Found flavors in S3 index for {search_key}")
-            else:
-                # If no index match, search through artifacts
-                found_flavors = set()
-
-                # Search for artifacts matching version and commit
-                for key in artifacts:
-                    if version_info in key and commit_short in key:
-                        try:
-                            parts = key.split("/")
-                            if len(parts) >= 2:
-                                flavor_with_version = parts[1]
-                                flavor = flavor_with_version.rsplit(
-                                    "-" + version_info, 1
-                                )[0]
-                                if flavor:
-                                    found_flavors.add(flavor)
-                        except Exception as e:
-                            logger.debug(f"Error parsing artifact key {key}: {e}")
-                            continue
-
-                flavors = list(found_flavors)
-
-            # Apply filters to S3 flavors
-            filtered_flavors = []
-            for flavor in flavors:
-                # Create a dummy combination with amd64 architecture for filtering
-                combination = ("amd64", flavor)
-                if should_include_only(
-                    flavor, include_only_patterns or []
-                ) and not should_exclude(flavor, wildcard_excludes or [], []):
-                    filtered_flavors.append(flavor)
-
-            if filtered_flavors:
-                logger.info(
-                    f"Found {len(filtered_flavors)} flavors in S3 artifacts after filtering"
-                )
-                return sorted(filtered_flavors)
-            else:
-                logger.info(
-                    f"No flavors found in S3 for version {version_info} and commit {commit_short} after filtering"
-                )
-
-        return []
-
-    except Exception as e:
-        logger.error(f"Error parsing flavors for commit {commit_short}: {e}")
         return []