Enhance handling of flavors.yaml checked out from GitHub

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

Author: NotTheEvilOne

src/gardenlinux/constants.py

@@ -140,6 +140,8 @@
     "secureboot.aws-efivars": "application/io.gardenlinux.cert.secureboot.aws-efivars",
 }
 
+GL_REPOSITORY_URL = "https://github.com/gardenlinux/gardenlinux"
+
 OCI_ANNOTATION_SIGNATURE_KEY = "io.gardenlinux.oci.signature"
 OCI_ANNOTATION_SIGNED_STRING_KEY = "io.gardenlinux.oci.signed-string"
 OCI_IMAGE_INDEX_MEDIA_TYPE = "application/vnd.oci.image.index.v1+json"

src/gardenlinux/flavors/__main__.py

@@ -6,12 +6,16 @@
 """
 
 from argparse import ArgumentParser
+from git import Repo
+from git.exc import GitError
+from pathlib import Path
+from tempfile import TemporaryDirectory
 import json
 import os
 import sys
 
+from ..constants import GL_REPOSITORY_URL
 from ..git import Git
-from ..github import GitHub
 
 from .parser import Parser
 
@@ -52,7 +56,7 @@ def parse_args():
     parser.add_argument(
         "--commit",
         default=None,
-        help="Commit hash to fetch flavors.yaml from GitHub (if not specified, uses local file).",
+        help="Commit hash to fetch flavors.yaml from GitHub. An existing 'flavors.yaml' file will be preferred.",
     )
     parser.add_argument(
         "--no-arch",
@@ -126,44 +130,27 @@ def main():
 
     args = parse_args()
 
-    if args.commit:
-        # Use GitHub API to fetch flavors.yaml
-        github = GitHub()
-        flavors_content = github.get_flavors_yaml(commit=args.commit)
-
-        parser = Parser(data=flavors_content)
-
-        combinations = parser.filter(
-            include_only_patterns=args.include_only,
-            wildcard_excludes=args.exclude,
-            only_build=args.build,
-            only_test=args.test,
-            only_test_platform=args.test_platform,
-            only_publish=args.publish,
-            filter_categories=args.category,
-            exclude_categories=args.exclude_category,
-        )
-    else:
-        # Use local file
-        flavors_file = os.path.join(Git().root, "flavors.yaml")
-
-        if not os.path.isfile(flavors_file):
-            sys.exit(f"Error: {flavors_file} does not exist.")
-
-        # Load and validate the flavors.yaml
-        with open(flavors_file, "r") as file:
-            flavors_data = file.read()
-
-        combinations = Parser(flavors_data).filter(
-            include_only_patterns=args.include_only,
-            wildcard_excludes=args.exclude,
-            only_build=args.build,
-            only_test=args.test,
-            only_test_platform=args.test_platform,
-            only_publish=args.publish,
-            filter_categories=args.category,
-            exclude_categories=args.exclude_category,
-        )
+    try:
+        flavors_data = _get_flavors_file_data(Path(Git().root, "flavors.yaml"))
+    except GitError:
+        with TemporaryDirectory() as git_directory:
+            repo = Repo.clone_from(GL_REPOSITORY_URL, git_directory, no_origin=True, sparse=True)
+
+            ref = repo.heads.main
+            if args.commit is not None: ref = ref.set_commit(args.commit)
+
+            flavors_data = _get_flavors_file_data(Path(repo.working_dir, "flavors.yaml"))
+
+    combinations = Parser(flavors_data).filter(
+        include_only_patterns=args.include_only,
+        wildcard_excludes=args.exclude,
+        only_build=args.build,
+        only_test=args.test,
+        only_test_platform=args.test_platform,
+        only_publish=args.publish,
+        filter_categories=args.category,
+        exclude_categories=args.exclude_category,
+    )
 
     if args.json_by_arch:
         grouped_combinations = Parser.group_by_arch(combinations)
@@ -187,6 +174,14 @@ def main():
         print("\n".join(sorted(set(printable_combinations))))
 
 
+def _get_flavors_file_data(flavors_file):
+    if not flavors_file.exists():
+        raise RuntimeError(f"Error: {flavors_file} does not exist.")
+
+    # Load and validate the flavors.yaml
+    with flavors_file.open("r") as fp:
+        return fp.read()
+
 if __name__ == "__main__":
     # Create a null logger as default
     main()

src/gardenlinux/flavors/parser.py

@@ -10,7 +10,6 @@
 
 from ..constants import GL_FLAVORS_SCHEMA
 from ..logger import LoggerSetup
-from ..github import GitHub
 
 
 class Parser(object):

src/gardenlinux/git/git.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import sys
 from git import Repo
 from git import Git as _Git
 from os import PathLike
 from pathlib import Path
+import sys
 
 from ..logger import LoggerSetup