Split OCI image manifest from generic manifest in gardenlinux.oci

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

Author: NotTheEvilOne

src/gardenlinux/oci/__init__.py

@@ -5,8 +5,9 @@
 """
 
 from .container import Container
+from .image_manifest import ImageManifest
 from .index import Index
 from .layer import Layer
 from .manifest import Manifest
 
-__all__ = ["Container", "Index", "Layer", "Manifest"]
+__all__ = ["Container", "ImageManifest", "Index", "Layer", "Manifest"]

src/gardenlinux/oci/__main__.py

@@ -121,7 +121,7 @@ def push_manifest(
     required=False,
     type=click.Path(),
     default=None,
-    help="Canonical Name of Image"
+    help="Canonical Name of Image",
 )
 @click.option(
     "--arch",

src/gardenlinux/oci/container.py

@@ -28,6 +28,7 @@
 
 from .index import Index
 from .layer import Layer
+from .image_manifest import ImageManifest
 from .manifest import Manifest
 from .schemas import index as IndexSchema
 
@@ -123,17 +124,7 @@ def __init__(
                 except Exception as login_error:
                     self._logger.error(f"Login error: {str(login_error)}")
 
-    def generate_index(self):
-        """
-        Generates an OCI image index
-
-        :return: (object) OCI image index
-        :since:  0.7.0
-        """
-
-        return Index()
-
-    def generate_manifest(
+    def generate_image_manifest(
         self,
         cname: str,
         architecture: Optional[str] = None,
@@ -151,7 +142,7 @@ def generate_manifest(
         :param feature_set: The expanded list of the included features of this manifest
 
         :return: (object) OCI image manifest
-        :since:  0.7.0
+        :since:  0.9.2
         """
 
         cname_object = CName(cname, architecture, version)
@@ -168,15 +159,13 @@ def generate_manifest(
         if commit is None:
             commit = ""
 
-        manifest = Manifest()
+        manifest = ImageManifest()
 
-        manifest["annotations"] = {}
-        manifest["annotations"]["version"] = version
-        manifest["annotations"]["cname"] = cname
-        manifest["annotations"]["architecture"] = architecture
-        manifest["annotations"]["feature_set"] = feature_set
-        manifest["annotations"]["flavor"] = f"{cname_object.flavor}-{architecture}"
-        manifest["annotations"]["commit"] = commit
+        manifest.version = version
+        manifest.cname = cname
+        manifest.arch = architecture
+        manifest.feature_set = feature_set
+        manifest.commit = commit
 
         description = (
             f"Image: {cname} "
@@ -195,6 +184,43 @@ def generate_manifest(
 
         return manifest
 
+    def generate_index(self):
+        """
+        Generates an OCI image index
+
+        :return: (object) OCI image index
+        :since:  0.7.0
+        """
+
+        return Index()
+
+    def generate_manifest(
+        self,
+        version: Optional[str] = None,
+        commit: Optional[str] = None,
+    ):
+        """
+        Generates an OCI manifest
+
+        :param cname: Canonical name of the manifest
+        :param architecture: Target architecture of the manifest
+        :param version: Artifacts version of the manifest
+        :param commit: The commit hash of the manifest
+        :param feature_set: The expanded list of the included features of this manifest
+
+        :return: (object) OCI manifest
+        :since:  0.9.2
+        """
+
+        manifest = Manifest()
+
+        manifest.version = version
+        manifest.commit = commit
+
+        manifest.config_from_dict({}, {})
+
+        return manifest
+
     def _get_index_without_response_parsing(self):
         """
         Return the response of an OCI image index request.
@@ -546,23 +572,28 @@ def read_or_generate_manifest(
         """
 
         if cname is None:
-            response = self._get_manifest_without_response_parsing(self._container_version)
+            manifest_type = Manifest
+
+            response = self._get_manifest_without_response_parsing(
+                self._container_version
+            )
         else:
+            manifest_type = ImageManifest
+
             if architecture is None:
                 architecture = CName(cname, architecture, version).arch
 
             response = self._get_manifest_without_response_parsing(
                 f"{self._container_version}-{cname}-{architecture}"
             )
-        #
 
         if response.ok:
-            manifest = Manifest(**response.json())
+            manifest = manifest_type(**response.json())
         elif response.status_code == 404:
             if cname is None:
-                manifest = Manifest()
+                manifest = self.generate_manifest(version, commit)
             else:
-                manifest = self.generate_manifest(
+                manifest = self.generate_image_manifest(
                     cname, architecture, version, commit, feature_set
                 )
         else:

src/gardenlinux/oci/image_manifest.py

@@ -0,0 +1,238 @@
+# -*- coding: utf-8 -*-
+
+import json
+from copy import deepcopy
+from oras.oci import Layer
+from os import PathLike
+from pathlib import Path
+
+from ..features import CName
+
+from .manifest import Manifest
+from .platform import NewPlatform
+from .schemas import EmptyManifestMetadata
+
+
+class ImageManifest(Manifest):
+    """
+    OCI image manifest
+
+    :author:     Garden Linux Maintainers
+    :copyright:  Copyright 2024 SAP SE
+    :package:    gardenlinux
+    :subpackage: oci
+    :since:      0.7.0
+    :license:    https://www.apache.org/licenses/LICENSE-2.0
+                 Apache License, Version 2.0
+    """
+
+    @property
+    def arch(self):
+        """
+        Returns the architecture of the OCI image manifest.
+
+        :return: (str) OCI image architecture
+        :since:  0.7.0
+        """
+
+        if "architecture" not in self.get("annotations", {}):
+            raise RuntimeError(
+                "Unexpected manifest with missing config annotation 'architecture' found"
+            )
+
+        return self["annotations"]["architecture"]
+
+    @arch.setter
+    def arch(self, value):
+        """
+        Sets the architecture of the OCI image manifest.
+
+        :param value: OCI image architecture
+
+        :since: 0.7.0
+        """
+
+        self._ensure_annotations_dict()
+        self["annotations"]["architecture"] = value
+
+    @property
+    def cname(self):
+        """
+        Returns the GardenLinux canonical name of the OCI image manifest.
+
+        :return: (str) OCI image GardenLinux canonical name
+        :since:  0.7.0
+        """
+
+        if "cname" not in self.get("annotations", {}):
+            raise RuntimeError(
+                "Unexpected manifest with missing config annotation 'cname' found"
+            )
+
+        return self["annotations"]["cname"]
+
+    @cname.setter
+    def cname(self, value):
+        """
+        Sets the GardenLinux canonical name of the OCI image manifest.
+
+        :param value: OCI image GardenLinux canonical name
+
+        :since: 0.7.0
+        """
+
+        self._ensure_annotations_dict()
+        self["annotations"]["cname"] = value
+
+    @property
+    def feature_set(self):
+        """
+        Returns the GardenLinux feature set of the OCI image manifest.
+
+        :return: (str) OCI image GardenLinux feature set
+        :since:  0.7.0
+        """
+
+        if "feature_set" not in self.get("annotations", {}):
+            raise RuntimeError(
+                "Unexpected manifest with missing config annotation 'feature_set' found"
+            )
+
+        return self["annotations"]["feature_set"]
+
+    @feature_set.setter
+    def feature_set(self, value):
+        """
+        Sets the GardenLinux feature set of the OCI image manifest.
+
+        :param value: OCI image GardenLinux feature set
+
+        :since: 0.7.0
+        """
+
+        self._ensure_annotations_dict()
+        self["annotations"]["feature_set"] = value
+
+    @property
+    def flavor(self):
+        """
+        Returns the GardenLinux flavor of the OCI image manifest.
+
+        :return: (str) OCI image GardenLinux flavor
+        :since:  0.7.0
+        """
+
+        return CName(self.cname).flavor
+
+    @property
+    def layers_as_dict(self):
+        """
+        Returns the OCI image manifest layers as a dictionary.
+
+        :return: (dict) OCI image manifest layers with title as key
+        :since:  0.7.0
+        """
+
+        layers = {}
+
+        for layer in self["layers"]:
+            if "org.opencontainers.image.title" not in layer.get("annotations", {}):
+                raise RuntimeError(
+                    "Unexpected layer with missing annotation 'org.opencontainers.image.title' found"
+                )
+
+            layers[layer["annotations"]["org.opencontainers.image.title"]] = layer
+
+        return layers
+
+    @property
+    def version(self):
+        """
+        Returns the GardenLinux version of the OCI image manifest.
+
+        :return: (str) OCI image GardenLinux version
+        :since:  0.7.0
+        """
+
+        if "version" not in self.get("annotations", {}):
+            raise RuntimeError(
+                "Unexpected manifest with missing config annotation 'version' found"
+            )
+
+        return self["annotations"]["version"]
+
+    @version.setter
+    def version(self, value):
+        """
+        Sets the GardenLinux version of the OCI image manifest.
+
+        :param value: OCI image GardenLinux version
+
+        :since: 0.7.0
+        """
+
+        self._ensure_annotations_dict()
+        self["annotations"]["version"] = value
+
+    def append_layer(self, layer):
+        """
+        Appends the given OCI image manifest layer to the manifest
+
+        :param layer: OCI image manifest layer
+
+        :since: 0.7.0
+        """
+
+        if not isinstance(layer, Layer):
+            raise RuntimeError("Unexpected layer type given")
+
+        layer_dict = layer.dict
+
+        if "org.opencontainers.image.title" not in layer_dict.get("annotations", {}):
+            raise RuntimeError(
+                "Unexpected layer with missing annotation 'org.opencontainers.image.title' found"
+            )
+
+        image_title = layer_dict["annotations"]["org.opencontainers.image.title"]
+        existing_layer_index = 0
+
+        for existing_layer in self["layers"]:
+            if "org.opencontainers.image.title" not in existing_layer.get(
+                "annotations", {}
+            ):
+                raise RuntimeError(
+                    "Unexpected layer with missing annotation 'org.opencontainers.image.title' found"
+                )
+
+            if (
+                image_title
+                == existing_layer["annotations"]["org.opencontainers.image.title"]
+            ):
+                break
+
+            existing_layer_index += 1
+
+        if len(self["layers"]) > existing_layer_index:
+            self["layers"].pop(existing_layer_index)
+
+        self["layers"].append(layer_dict)
+
+    def write_metadata_file(self, manifest_file_path_name):
+        if not isinstance(manifest_file_path_name, PathLike):
+            manifest_file_path_name = Path(manifest_file_path_name)
+
+        metadata_annotations = {
+            "cname": self.cname,
+            "architecture": self.arch,
+            "feature_set": self.feature_set,
+        }
+
+        metadata = deepcopy(EmptyManifestMetadata)
+        metadata["mediaType"] = "application/vnd.oci.image.manifest.v1+json"
+        metadata["digest"] = self.digest
+        metadata["size"] = self.size
+        metadata["annotations"] = metadata_annotations
+        metadata["platform"] = NewPlatform(self.arch, self.version)
+
+        with open(manifest_file_path_name, "w") as fp:
+            fp.write(json.dumps(metadata))