Restructure gardenlinux.oci to clean up code and logic

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

Author: NotTheEvilOne

src/gardenlinux/constants.py

@@ -166,3 +166,4 @@
 
 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/features/cname.py

@@ -5,6 +5,8 @@
 
 from ..constants import ARCHS
 
+from .parser import Parser
+
 
 class CName(object):
     def __init__(self, cname, arch=None, version=None):
@@ -66,6 +68,10 @@ def commit_id(self) -> Optional[str]:
     def flavor(self) -> str:
         return self._flavor
 
+    @property
+    def feature_set(self) -> str:
+        return Parser().filter_as_string(self.flavor)
+
     @property
     def version(self) -> Optional[str]:
         return self._version

src/gardenlinux/features/parser.py

@@ -18,12 +18,17 @@
 
 
 class Parser(object):
+    _GARDENLINUX_ROOT: str = "."
+
     def __init__(
         self,
-        gardenlinux_root: str = ".",
-        feature_dir_name: str = "features",
+        gardenlinux_root: Optional[str] = None,
+        feature_dir_name: Optional[str] = "features",
         logger: Optional[logging.Logger] = None,
     ):
+        if gardenlinux_root is None:
+            gardenlinux_root = Parser._GARDENLINUX_ROOT
+
         feature_base_dir = os.path.join(gardenlinux_root, feature_dir_name)
 
         if not os.access(feature_base_dir, os.R_OK):
@@ -248,6 +253,10 @@ def filter_func(a, b):
     def _get_graph_node_type(node):
         return node.get("content", {}).get("type")
 
+    @staticmethod
+    def set_default_gardenlinux_root_dir(root_dir):
+        Parser._GARDENLINUX_ROOT = root_dir
+
     @staticmethod
     def sort_graph_nodes(graph):
         def key_function(node):

src/gardenlinux/git/git.py

@@ -1,16 +1,18 @@
 # -*- 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
 
 
-class Git:
+class Git(object):
     """Git operations handler."""
 
-    def __init__(self, logger=None):
+    def __init__(self, git_directory=".", logger=None):
         """Initialize Git handler.
 
         Args:
@@ -20,11 +22,31 @@ def __init__(self, logger=None):
         if logger is None or not logger.hasHandlers():
             logger = LoggerSetup.get_logger("gardenlinux.git")
 
+        if not isinstance(git_directory, PathLike):
+            git_directory = Path(git_directory)
+
+        if not git_directory.is_dir():
+            raise RuntimeError(f"Git directory given is invalid: {git_directory}")
+
+        self._git_directory = git_directory
         self._logger = logger
 
-    def get_root(self):
+    @property
+    def commit_id(self):
+        """Get the commit ID for Git `HEAD`."""
+        return str(self.root_repo.head.commit)
+
+    @property
+    def root(self):
         """Get the root directory of the current Git repository."""
-        root_dir = Git(".").rev_parse("--show-superproject-working-tree")
-        self.log.debug(f"Git root directory: {root_dir}")
+        root_dir = _Git(self._git_directory).rev_parse(
+            "--show-superproject-working-tree"
+        )
 
+        self._logger.debug(f"Git root directory: {root_dir}")
         return Path(root_dir)
+
+    @property
+    def root_repo(self):
+        """Get the root Git `Repo` instance."""
+        return Repo(self.root)

src/gardenlinux/oci/__init__.py

@@ -1 +1,8 @@
 # -*- coding: utf-8 -*-
+
+from .container import Container
+from .index import Index
+from .layer import Layer
+from .manifest import Manifest
+
+__all__ = ["Container", "Index", "Layer", "Manifest"]

src/gardenlinux/oci/__main__.py

@@ -5,7 +5,7 @@
 
 from pygments.lexer import default
 
-from .registry import GlociRegistry
+from .container import Container
 
 
 @click.group()
@@ -26,6 +26,13 @@ def cli():
     type=click.Path(),
     help="Version of image",
 )
+@click.option(
+    "--commit",
+    required=False,
+    type=click.Path(),
+    default=None,
+    help="Commit of image",
+)
 @click.option(
     "--arch",
     required=True,
@@ -60,6 +67,7 @@ def cli():
 def push_manifest(
     container,
     version,
+    commit,
     arch,
     cname,
     directory,
@@ -69,17 +77,19 @@ def push_manifest(
     additional_tag,
 ):
     """push artifacts from a dir to a registry, get the index-entry for the manifest in return"""
-    container_name = f"{container}:{version}"
-    registry = GlociRegistry(
-        container_name=container_name,
-        token=os.getenv("GL_CLI_REGISTRY_TOKEN"),
+    container = Container(
+        f"{container}:{version}",
         insecure=insecure,
     )
-    digest = registry.push_from_dir(
-        arch, version, cname, directory, manifest_file, additional_tag
+
+    manifest = container.read_or_generate_manifest(cname, arch, version, commit)
+
+    container.push_manifest_and_artifacts_from_directory(
+        manifest, directory, manifest_file, additional_tag
     )
+
     if cosign_file:
-        print(digest, file=open(cosign_file, "w"))
+        print(manifest.digest, file=open(cosign_file, "w"))
 
 
 @cli.command()
@@ -115,13 +125,12 @@ def push_manifest(
 )
 def update_index(container, version, manifest_folder, insecure, additional_tag):
     """push a index entry from a list of files to an index"""
-    container_name = f"{container}:{version}"
-    registry = GlociRegistry(
-        container_name=container_name,
-        token=os.getenv("GL_CLI_REGISTRY_TOKEN"),
+    container = Container(
+        f"{container}:{version}",
         insecure=insecure,
     )
-    registry.update_index(manifest_folder, additional_tag)
+
+    container.push_index_from_directory(manifest_folder, additional_tag)
 
 
 def main():