feat: decouple S3 upload from features directory

Author: nkraetzschmar

src/gardenlinux/s3/s3_artifacts.py

@@ -18,7 +18,6 @@
 
 import yaml
 
-from ..features.cname import CName
 from .bucket import Bucket
 
 
@@ -116,11 +115,6 @@ def upload_from_directory(
 
         artifacts_dir = Path(artifacts_dir)
 
-        cname_object = CName(cname)
-
-        if cname_object.arch is None:
-            raise RuntimeError("Architecture could not be determined from cname")
-
         if not artifacts_dir.is_dir():
             raise RuntimeError(f"Artifacts directory given is invalid: {artifacts_dir}")
 
@@ -130,18 +124,17 @@ def upload_from_directory(
         release_config = ConfigParser(allow_unnamed_section=True)
         release_config.read(release_file)
 
-        if cname_object.version != release_config.get(
-            UNNAMED_SECTION, "GARDENLINUX_VERSION"
-        ):
-            raise RuntimeError(
-                f"Release file data and given cname conflict detected: Version {cname_object.version}"
-            )
+        # Get architecture from the GARDENLINUX_CNAME (second to last element when split by -)
+        release_cname = release_config.get(UNNAMED_SECTION, "GARDENLINUX_CNAME")
+        cname_parts = release_cname.split("-")
+        if len(cname_parts) < 2:
+            raise RuntimeError(f"Invalid GARDENLINUX_CNAME format in release file: {release_cname}")
+        arch = cname_parts[-2]  # Second to last element is the architecture
 
-        if cname_object.commit_id != release_config.get(
-            UNNAMED_SECTION, "GARDENLINUX_COMMIT_ID"
-        ):
+        # Verify the provided cname matches the release file
+        if cname != release_cname:
             raise RuntimeError(
-                f"Release file data and given cname conflict detected: Commit ID {cname_object.commit_id}"
+                f"Release file cname does not match provided cname: {release_cname} != {cname}"
             )
 
         commit_hash = release_config.get(UNNAMED_SECTION, "GARDENLINUX_COMMIT_ID_LONG")
@@ -171,13 +164,16 @@ def upload_from_directory(
         if secureboot is None:
             secureboot = "_trustedboot" in feature_list
 
+        version = release_config.get(UNNAMED_SECTION, "GARDENLINUX_VERSION")
+        platform = release_config.get(UNNAMED_SECTION, "GARDENLINUX_PLATFORM")
+
         metadata = {
-            "platform": cname_object.platform,
-            "architecture": cname_object.arch,
+            "platform": platform,
+            "architecture": arch,
             "base_image": None,
             "build_committish": commit_hash,
             "build_timestamp": datetime.fromtimestamp(release_timestamp).isoformat(),
-            "gardenlinux_epoch": int(cname_object.version.split(".", 1)[0]),
+            "gardenlinux_epoch": int(version.split(".", 1)[0]),
             "logs": None,
             "modifiers": feature_list,
             "require_uefi": require_uefi,
@@ -186,10 +182,15 @@ def upload_from_directory(
             "s3_bucket": self._bucket.name,
             "s3_key": f"meta/singles/{cname}",
             "test_result": None,
-            "version": cname_object.version,
+            "version": version,
             "paths": [],
         }
 
+        if release_config.has_option(UNNAMED_SECTION, "GARDENLINUX_PLATFORM_VARIANT"):
+            metadata["platform_variant"] = release_config.get(
+                UNNAMED_SECTION, "GARDENLINUX_PLATFORM_VARIANT"
+            )
+
         re_object = re.compile("[^a-zA-Z0-9\\s+\\-=.\\_:/@]")
 
         for artifact in artifacts_dir.iterdir():
@@ -219,9 +220,9 @@ def upload_from_directory(
             }
 
             s3_tags = {
-                "architecture": re_object.sub("+", cname_object.arch),
-                "platform": re_object.sub("+", cname_object.platform),
-                "version": re_object.sub("+", cname_object.version),
+                "architecture": re_object.sub("+", arch),
+                "platform": re_object.sub("+", platform),
+                "version": re_object.sub("+", version),
                 "committish": commit_hash,
                 "md5sum": md5sum,
                 "sha256sum": sha256sum,