From 4e5de3808e2bf56e1060937c4d5e1796df441fa4 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 25 Sep 2023 22:23:52 -0400
Subject: [PATCH] osbuild/util: add containers_source helper

This will hoist even more code into util out of the skopeo stage.
Now a caller can call:

    with containers.container_source(image) as (image_name, image_source):
        print(f"{image_name}, {image_source}")

to process containers inputs.
---
 osbuild/util/containers.py | 29 +++++++++++++++++++++++++++++
 stages/org.osbuild.skopeo  | 26 ++------------------------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/osbuild/util/containers.py b/osbuild/util/containers.py
index be49c4a1..2f4b702f 100644
--- a/osbuild/util/containers.py
+++ b/osbuild/util/containers.py
@@ -1,6 +1,9 @@
 import json
 import os
 import subprocess
+import tempfile
+from contextlib import contextmanager
+
 
 def is_manifest_list(data):
     """Inspect a manifest determine if it's a multi-image manifest-list."""
@@ -99,3 +102,29 @@ def merge_manifest(list_manifest, destination):
 
     # copy the index manifest into the destination
     subprocess.run(["cp", "--reflink=auto", "-a", list_manifest, dest_manifest], check=True)
+
+
+@contextmanager
+def container_source(image):
+    image_filepath = image["filepath"]
+    container_format = image["data"]["format"]
+    image_name = image["data"]["name"]
+
+    if container_format not in ("dir", "oci-archive"):
+        raise RuntimeError(f"Unknown container format {container_format}")
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        tmp_source = os.path.join(tmpdir, "image")
+
+        if container_format == "dir" and image["manifest-list"]:
+            # copy the source container to the tmp source so we can merge the manifest into it
+            subprocess.run(["cp", "-a", "--reflink=auto", image_filepath, tmp_source], check=True)
+            merge_manifest(image["manifest-list"], tmp_source)
+        else:
+            # We can't have special characters like ":" in the source names because containers/image
+            # treats them special, like e.g. /some/path:tag, so we make a symlink to the real name
+            # and pass the symlink name to skopeo to make it work with anything
+            os.symlink(image_filepath, tmp_source)
+
+        image_source = f"{container_format}:{tmp_source}"
+        yield image_name, image_source
diff --git a/stages/org.osbuild.skopeo b/stages/org.osbuild.skopeo
index 5010a6cf..565884bc 100755
--- a/stages/org.osbuild.skopeo
+++ b/stages/org.osbuild.skopeo
@@ -10,7 +10,6 @@ Buildhost commands used: `skopeo`.
 import os
 import subprocess
 import sys
-import tempfile
 
 import osbuild.api
 from osbuild.util import containers
@@ -69,30 +68,9 @@ def main(inputs, output, options):
     storage_driver = destination.get("storage-driver", "overlay")
 
     for image in images.values():
-        source = image["filepath"]
-        source_data = image["data"]
-        container_format = source_data["format"]
-        image_name = source_data["name"]
-
-        with tempfile.TemporaryDirectory() as tmpdir:
-            tmp_source = os.path.join(tmpdir, "image")
-
-            if container_format == "dir" and image["manifest-list"]:
-                # copy the source container to the tmp source so we can merge the manifest into it
-                subprocess.run(["cp", "-a", "--reflink=auto", source, tmp_source], check=True)
-                containers.merge_manifest(image["manifest-list"], tmp_source)
-            else:
-                # We can't have special characters like ":" in the source names because containers/image
-                # treats them special, like e.g. /some/path:tag, so we make a symlink to the real name
-                # and pass the symlink name to skopeo to make it work with anything
-                os.symlink(source, tmp_source)
-
-            if container_format not in ("dir", "oci-archive"):
-                raise RuntimeError(f"Unknown container format {container_format}")
-
-            source = f"{container_format}:{tmp_source}"
+        with containers.container_source(image) as (image_name, image_source):
             dest = f"containers-storage:[{storage_driver}@{output}{storage_root}+/run/containers/storage]{image_name}"
-            subprocess.run(["skopeo", "copy", source, dest], check=True)
+            subprocess.run(["skopeo", "copy", image_source, dest], check=True)
 
     if storage_driver == "overlay":
         # Each time the overlay backend runs on an xfs fs it creates this file: