Add support to additionally tag an existing OCI manifest

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

Author: NotTheEvilOne

.github/actions/features_parse/action.yml

@@ -11,7 +11,7 @@ outputs:
 runs:
   using: composite
   steps:
-    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].0
+    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].1
     - id: result
       shell: bash
       run: |

.github/actions/flavors_parse/action.yml

@@ -13,7 +13,7 @@ outputs:
 runs:
   using: composite
   steps:
-    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].0
+    - uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].1
     - id: matrix
       shell: bash
       run: |

.github/actions/setup/action.yml

@@ -4,7 +4,7 @@ description: Installs the given GardenLinux Python library
 inputs:
   version:
     description: GardenLinux Python library version
-    default: "0.9.0"
+    default: "0.9.1"
   python_version:
     description: Python version to setup
     default: "3.13"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gardenlinux"
-version = "0.9.0"
+version = "0.9.1"
 description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames"
 authors = ["Garden Linux Maintainers <[email protected]>"]
 license = "Apache-2.0"

src/gardenlinux/oci/__main__.py

@@ -31,26 +31,28 @@ def cli():
     help="Container Name",
 )
 @click.option(
-    "--version",
-    required=True,
-    type=click.Path(),
-    help="Version of image",
+    "--cname", required=True, type=click.Path(), help="Canonical Name of Image"
 )
 @click.option(
-    "--commit",
+    "--arch",
     required=False,
     type=click.Path(),
     default=None,
-    help="Commit of image",
+    help="Target Image CPU Architecture",
 )
 @click.option(
-    "--arch",
-    required=True,
+    "--version",
+    required=False,
     type=click.Path(),
-    help="Target Image CPU Architecture",
+    default=None,
+    help="Version of image",
 )
 @click.option(
-    "--cname", required=True, type=click.Path(), help="Canonical Name of Image"
+    "--commit",
+    required=False,
+    type=click.Path(),
+    default=None,
+    help="Commit of image",
 )
 @click.option("--dir", "directory", required=True, help="path to the build artifacts")
 @click.option(
@@ -76,10 +78,10 @@ def cli():
 )
 def push_manifest(
     container,
+    cname,
+    arch,
     version,
     commit,
-    arch,
-    cname,
     directory,
     cosign_file,
     manifest_file,
@@ -107,6 +109,76 @@ def push_manifest(
         print(manifest.digest, file=open(cosign_file, "w"))
 
 
+@cli.command()
+@click.option(
+    "--container",
+    required=True,
+    type=click.Path(),
+    help="Container Name",
+)
+@click.option(
+    "--cname",
+    required=False,
+    type=click.Path(),
+    default=None,
+    help="Canonical Name of Image"
+)
+@click.option(
+    "--arch",
+    required=False,
+    type=click.Path(),
+    default=None,
+    help="Target Image CPU Architecture",
+)
+@click.option(
+    "--version",
+    required=False,
+    type=click.Path(),
+    default=None,
+    help="Version of image",
+)
+@click.option(
+    "--commit",
+    required=False,
+    type=click.Path(),
+    default=None,
+    help="Commit of image",
+)
+@click.option(
+    "--insecure",
+    default=False,
+    help="Use HTTP to communicate with the registry",
+)
+@click.option(
+    "--tag",
+    required=True,
+    multiple=True,
+    help="Tag to push the manifest with",
+)
+def push_manifest_tags(
+    container,
+    cname,
+    arch,
+    version,
+    commit,
+    insecure,
+    tag,
+):
+    """
+    Push artifacts and the manifest from a directory to a registry.
+
+    :since: 0.7.0
+    """
+
+    container = Container(
+        f"{container}:{version}",
+        insecure=insecure,
+    )
+
+    manifest = container.read_or_generate_manifest(cname, arch, version, commit)
+    container.push_manifest_for_tags(manifest, tag)
+
+
 @cli.command()
 @click.option(
     "--container",

src/gardenlinux/oci/container.py

@@ -520,14 +520,14 @@ def read_or_generate_index(self):
 
     def read_or_generate_manifest(
         self,
-        cname: str,
+        cname: Optional[str] = None,
         architecture: Optional[str] = None,
         version: Optional[str] = None,
         commit: Optional[str] = None,
         feature_set: Optional[str] = None,
     ) -> Manifest:
         """
-        Reads from registry or generates the OCI image manifest.
+        Reads from registry or generates the OCI manifest.
 
         :param cname: Canonical name of the manifest
         :param architecture: Target architecture of the manifest
@@ -539,19 +539,26 @@ def read_or_generate_manifest(
         :since:  0.7.0
         """
 
-        if architecture is None:
-            architecture = CName(cname, architecture, version).arch
+        if cname is None:
+            response = self._get_manifest_without_response_parsing(self._container_version)
+        else:
+            if architecture is None:
+                architecture = CName(cname, architecture, version).arch
 
-        response = self._get_manifest_without_response_parsing(
-            f"{self._container_version}-{cname}-{architecture}"
-        )
+            response = self._get_manifest_without_response_parsing(
+                f"{self._container_version}-{cname}-{architecture}"
+            )
+        #
 
         if response.ok:
             manifest = Manifest(**response.json())
         elif response.status_code == 404:
-            manifest = self.generate_manifest(
-                cname, architecture, version, commit, feature_set
-            )
+            if cname is None:
+                manifest = Manifest()
+            else:
+                manifest = self.generate_manifest(
+                    cname, architecture, version, commit, feature_set
+                )
         else:
             response.raise_for_status()
 

tests/oci/test_oci.py

@@ -66,6 +66,41 @@ def push_manifest(runner, version, arch, cname, additional_tags=None):
         return False
 
 
+def push_manifest_tags(runner, version, arch, cname, tags=None):
+    """Push manifest to registry and return success status"""
+    print(f"Pushing manifest for {cname} {arch}")
+
+    cmd = [
+        "push-manifest-tags",
+        "--container",
+        CONTAINER_NAME_ZOT_EXAMPLE,
+        "--version",
+        version,
+        "--arch",
+        arch,
+        "--cname",
+        cname,
+        "--insecure",
+        "True",
+    ]
+
+    if tags:
+        for tag in tags:
+            cmd.extend(["--tag", tag])
+
+    try:
+        result = runner.invoke(
+            gl_oci,
+            cmd,
+            catch_exceptions=False,
+        )
+        print(f"Push manifest tags output: {result.output}")
+        return result.exit_code == 0
+    except Exception as e:
+        print(f"Error during push manifest tags: {str(e)}")
+        return False
+
+
 def update_index(runner, version, additional_tags=None):
     """Update index in registry and return success status"""
     print("Updating index")
@@ -278,12 +313,25 @@ def test_push_manifest_and_index(
     repo_name = "gardenlinux-example"
     combined_tag = f"{version}-{cname}-{arch}"
 
+    post_push_manifest_tags = []
+
     # Push manifest and update index
+    if cname.startswith(f"{TEST_PLATFORMS[1]}-"):
+        post_push_manifest_tags = additional_tags_manifest
+        additional_tags_manifest = []
+
     push_successful = push_manifest(
         runner, version, arch, cname, additional_tags_manifest
     )
     assert push_successful, "Manifest push should succeed"
 
+    if len(post_push_manifest_tags) > 0:
+        push_successful = push_manifest_tags(
+            runner, version, arch, cname, post_push_manifest_tags
+        )
+        assert push_successful, "Manifest tags push should succeed"
+    #
+
     if push_successful:
         update_index_successful = update_index(runner, version, additional_tags_index)
         assert update_index_successful, "Index update should succeed"