Enforce one platform policy for GardenLinux canonical names

Signed-off-by: Tobias Wolf <[email protected]>
On-behalf-of: SAP <[email protected]>

Author: NotTheEvilOne

src/gardenlinux/s3/__main__.py

@@ -36,4 +36,6 @@ def main() -> None:
     if args.action == "download-artifacts-from-bucket":
         S3Artifacts(args.bucket).download_to_directory(args.cname, args.path)
     elif args.action == "upload-artifacts-to-bucket":
-        S3Artifacts(args.bucket).upload_from_directory(args.cname, args.path, dry_run=args.dry_run)
+        S3Artifacts(args.bucket).upload_from_directory(
+            args.cname, args.path, dry_run=args.dry_run
+        )

src/gardenlinux/s3/s3_artifacts.py

@@ -19,6 +19,7 @@
 import yaml
 
 from .bucket import Bucket
+from ..features import CName
 
 
 class S3Artifacts(object):
@@ -116,36 +117,20 @@ def upload_from_directory(
 
         artifacts_dir = Path(artifacts_dir)
 
+        cname_object = CName(cname)
+
         if not artifacts_dir.is_dir():
             raise RuntimeError(f"Artifacts directory given is invalid: {artifacts_dir}")
 
         release_file = artifacts_dir.joinpath(f"{cname}.release")
         release_timestamp = stat(release_file).st_ctime
 
-        release_config = ConfigParser(allow_unnamed_section=True)
-        release_config.read(release_file)
-
-        # 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
+        cname_object.load_from_release_file(release_file)
 
-        commit_id = release_config.get(UNNAMED_SECTION, "GARDENLINUX_COMMIT_ID")
-        expected_cname = f"{release_cname}-{commit_id}"
-
-        # Verify the provided cname matches the release file
-        if cname != expected_cname:
-            raise RuntimeError(
-                f"Release file cname does not match provided cname: {expected_cname} != {cname}"
-            )
-
-        commit_hash = release_config.get(UNNAMED_SECTION, "GARDENLINUX_COMMIT_ID_LONG")
-
-        feature_set = release_config.get(UNNAMED_SECTION, "GARDENLINUX_FEATURES")
-        feature_list = feature_set.split(",")
+        if cname_object.arch is None:
+            raise RuntimeError("Architecture could not be determined from cname")
 
+        feature_list = cname_object.feature_set
         requirements_file = artifacts_dir.joinpath(f"{cname}.requirements")
         require_uefi = None
         secureboot = None
@@ -168,33 +153,25 @@ 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": platform,
-            "architecture": arch,
+            "platform": cname_object.feature_set_platform,
+            "architecture": cname_object.arch,
             "base_image": None,
-            "build_committish": commit_hash,
+            "build_committish": cname_object.commit_hash,
             "build_timestamp": datetime.fromtimestamp(release_timestamp).isoformat(),
-            "gardenlinux_epoch": int(version.split(".", 1)[0]),
+            "gardenlinux_epoch": int(cname_object.version.split(".", 1)[0]),
             "logs": None,
-            "modifiers": feature_list,
+            "modifiers": cname_object.feature_set,
             "require_uefi": require_uefi,
             "secureboot": secureboot,
             "published_image_metadata": None,
             "s3_bucket": self._bucket.name,
             "s3_key": f"meta/singles/{cname}",
             "test_result": None,
-            "version": version,
+            "version": cname_object.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():
@@ -224,16 +201,14 @@ def upload_from_directory(
             }
 
             s3_tags = {
-                "architecture": re_object.sub("+", arch),
-                "platform": re_object.sub("+", platform),
-                "version": re_object.sub("+", version),
-                "committish": commit_hash,
+                "architecture": re_object.sub("+", cname_object.arch),
+                "platform": re_object.sub("+", cname_object.platform),
+                "version": re_object.sub("+", cname_object.version),
+                "committish": cname_object.commit_hash,
                 "md5sum": md5sum,
                 "sha256sum": sha256sum,
             }
 
-            metadata["paths"].append(artifact_metadata)
-
             if not dry_run:
                 if delete_before_push:
                     self._bucket.delete_objects(Delete={"Objects": [{"Key": s3_key}]})
@@ -244,6 +219,8 @@ def upload_from_directory(
                     ExtraArgs={"Tagging": urlencode(s3_tags)},
                 )
 
+            metadata["paths"].append(artifact_metadata)
+
         if dry_run:
             print(yaml.dump(metadata, sort_keys=False))
         else: