Update S3 artifact metadata suffix , gardenlinux_epoch and `build_timestamp (#314)

* Ensure S3 artifact metadata `suffix` is not missing content
* Ensure S3 aritfact metadata `gardenlinux_epoch` remains a int
* Bump version to `0.10.13`

Signed-off-by: Tobias Wolf <wolf@b1-systems.de>
On-behalf-of: SAP <tobias.wolf@sap.com>

Author: NotTheEvilOne

.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.10.12"
+    default: "0.10.13"
   python_version:
     description: Python version to setup
     default: "3.13"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gardenlinux"
-version = "0.10.12"
+version = "0.10.13"
 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 <contact@gardenlinux.io>"]
 license = "Apache-2.0"

src/gardenlinux/s3/s3_artifacts.py

@@ -133,6 +133,7 @@ def upload_from_directory(
         requirements_file = artifacts_dir.joinpath(f"{base_name}.requirements")
         require_uefi = None
         secureboot = None
+        tpm2 = None
 
         if requirements_file.exists():
             requirements_config = ConfigParser(allow_unnamed_section=True)
@@ -149,6 +150,9 @@ def upload_from_directory(
                     UNNAMED_SECTION, "secureboot"
                 )
 
+            if requirements_config.has_option(UNNAMED_SECTION, "tpm2"):
+                tpm2 = requirements_config.getboolean(UNNAMED_SECTION, "tpm2")
+
         if arch is None:
             raise RuntimeError(
                 "Architecture could not be determined from release or requirements file"
@@ -160,6 +164,9 @@ def upload_from_directory(
         if secureboot is None:
             secureboot = "_trustedboot" in feature_set_list
 
+        if tpm2 is None:
+            tpm2 = "_tpm2" in feature_set_list
+
         # RegEx for S3 supported characters
         re_object = re.compile("[^a-zA-Z0-9\\s+\\-=.\\_:/@]")
 
@@ -169,22 +176,17 @@ def upload_from_directory(
         if commit_id_or_hash is None:
             commit_id_or_hash = cname_object.commit_id
 
-        version_epoch = str(cname_object.version_epoch)
-
-        if version_epoch is None:
-            version_epoch = ""
-
         metadata = {
             "platform": cname_object.feature_set_platform,
             "architecture": arch,
             "base_image": None,
             "build_committish": commit_id_or_hash,
-            "build_timestamp": datetime.fromtimestamp(release_timestamp).isoformat(),
-            "gardenlinux_epoch": version_epoch,
+            "build_timestamp": datetime.fromtimestamp(release_timestamp),
             "logs": None,
             "modifiers": feature_set_list,
             "require_uefi": require_uefi,
             "secureboot": secureboot,
+            "tpm2": tpm2,
             "published_image_metadata": None,
             "s3_bucket": self._bucket.name,
             "s3_key": f"meta/singles/{base_name}",
@@ -193,6 +195,9 @@ def upload_from_directory(
             "paths": [],
         }
 
+        if cname_object.version_epoch is not None:
+            metadata["gardenlinux_epoch"] = cname_object.version_epoch
+
         platform_variant = cname_object.platform_variant
 
         if platform_variant is not None:
@@ -210,13 +215,11 @@ def upload_from_directory(
                 md5sum = file_digest(fp, "md5").hexdigest()
                 sha256sum = file_digest(fp, "sha256").hexdigest()
 
-            suffixes = "".join(artifact.name)[1 + base_name_length :]
-
             artifact_metadata = {
                 "name": artifact.name,
                 "s3_bucket_name": self._bucket.name,
                 "s3_key": s3_key,
-                "suffix": re_object.sub("+", suffixes),
+                "suffix": re_object.sub("+", artifact.name[base_name_length:]),
                 "md5sum": md5sum,
                 "sha256sum": sha256sum,
             }

tests/s3/constants.py

@@ -16,14 +16,14 @@
 architecture: amd64
 base_image: null
 build_committish: abc123lo
-build_timestamp: '{build_timestamp}'
-gardenlinux_epoch: '1234'
+build_timestamp: {build_timestamp}
 logs: null
 modifiers:
 - _usi
 - _trustedboot
 require_uefi: true
 secureboot: true
+tpm2: false
 published_image_metadata: null
 s3_bucket: test-bucket
 s3_key: meta/singles/container-amd64-1234.1-abc123lo
@@ -33,7 +33,8 @@
 - name: container-amd64-1234.1-abc123lo.release
   s3_bucket_name: test-bucket
   s3_key: objects/container-amd64-1234.1-abc123lo/container-amd64-1234.1-abc123lo.release
-  suffix: release
+  suffix: .release
   md5sum: {md5sum}
   sha256sum: {sha256sum}
+gardenlinux_epoch: 1234
 """.strip()

tests/s3/test_main.py

@@ -96,8 +96,8 @@ def test_main_with_expected_result(
         result = capsys.readouterr().out.strip()
 
         result = re.sub(
-            "^(.*)build_timestamp\\: '.+'$",
-            "\\1build_timestamp: '{build_timestamp}'",
+            "^(.*)build_timestamp\\: (\\w|\\-|\\:|\\.| )+$",
+            "\\1build_timestamp: {build_timestamp}",
             result,
             flags=re.M,
         )