Fix gardenlinux_epoch value of S3 artifact metadata and add test for it

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

Author: NotTheEvilOne

src/gardenlinux/s3/s3_artifacts.py

@@ -180,7 +180,7 @@ def upload_from_directory(
             "base_image": None,
             "build_committish": commit_id_or_hash,
             "build_timestamp": datetime.fromtimestamp(release_timestamp).isoformat(),
-            "gardenlinux_epoch": {version_epoch},
+            "gardenlinux_epoch": version_epoch,
             "logs": None,
             "modifiers": cname_object.feature_set,
             "require_uefi": require_uefi,

tests/s3/constants.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+RELEASE_DATA = """
+GARDENLINUX_CNAME="container-amd64-1234.1-abc123lo"
+GARDENLINUX_VERSION=1234.1
+GARDENLINUX_COMMIT_ID="abc123lo"
+GARDENLINUX_COMMIT_ID_LONG="abc123long"
+GARDENLINUX_FEATURES="_usi,_trustedboot"
+GARDENLINUX_FEATURES_ELEMENTS=
+GARDENLINUX_FEATURES_FLAGS="_usi,_trustedboot"
+GARDENLINUX_FEATURES_PLATFORMS="container"
+"""
+
+S3_METADATA = """
+platform: container
+architecture: amd64
+base_image: null
+build_committish: abc123lo
+build_timestamp: '{build_timestamp}'
+gardenlinux_epoch: '1234'
+logs: null
+modifiers: _usi,_trustedboot
+require_uefi: true
+secureboot: true
+published_image_metadata: null
+s3_bucket: test-bucket
+s3_key: meta/singles/container-amd64-1234.1-abc123lo
+test_result: null
+version: '1234.1'
+paths:
+- 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
+  md5sum: {md5sum}
+  sha256sum: {sha256sum}
+""".strip()

tests/s3/test_main.py

@@ -1,3 +1,4 @@
+import re
 import sys
 from typing import Any, Dict, List
 from unittest.mock import MagicMock, patch
@@ -6,6 +7,9 @@
 
 import gardenlinux.s3.__main__ as s3m
 
+from .conftest import S3Env
+from .constants import RELEASE_DATA, S3_METADATA
+
 
 @pytest.mark.parametrize(
     "argv, expected_method, expected_args, expected_kwargs",
@@ -48,14 +52,58 @@ def test_main_calls_correct_artifacts(
     expected_args: List[Any],
     expected_kwargs: Dict[str, Any],
 ) -> None:
-    with patch.object(sys, "argv", argv):
-        with patch.object(s3m, "S3Artifacts") as mock_s3_cls:
-            mock_instance = MagicMock()
-            mock_s3_cls.return_value = mock_instance
+    with (
+        patch.object(sys, "argv", argv),
+        patch.object(s3m, "S3Artifacts") as mock_s3_cls,
+    ):
+        mock_instance = MagicMock()
+        mock_s3_cls.return_value = mock_instance
+
+        s3m.main()
+
+        method = getattr(mock_instance, expected_method)
+        method.assert_called_once_with(*expected_args, **expected_kwargs)
+
+        mock_s3_cls.assert_called_once_with("test-bucket")
+
+
+def test_main_with_expected_result(
+    s3_setup: S3Env, capsys: pytest.CaptureFixture[str]
+) -> None:
+    env = s3_setup
+
+    # Arrange
+    with patch.object(
+        sys,
+        "argv",
+        [
+            "__main__.py",
+            "--dry-run",
+            "--bucket",
+            env.bucket_name,
+            "--path",
+            str(env.tmp_path),
+            "upload-artifacts-to-bucket",
+            "--artifact-name",
+            env.cname,
+        ],
+    ):
+        release_path = env.tmp_path / f"{env.cname}.release"
+        release_path.write_text(RELEASE_DATA)
+
+        s3m.main()
+
+        result = capsys.readouterr().out.strip()
 
-            s3m.main()
+        result = re.sub(
+            "^(.*)build_timestamp\\: '.+'$",
+            "\\1build_timestamp: '{build_timestamp}'",
+            result,
+            flags=re.M,
+        )
 
-            method = getattr(mock_instance, expected_method)
-            method.assert_called_once_with(*expected_args, **expected_kwargs)
+        result = re.sub(
+            "^(.*)(md5sum|sha256sum)\\: .+$", "\\1\\2: {\\2}", result, flags=re.M
+        )
 
-            mock_s3_cls.assert_called_once_with("test-bucket")
+        assert result == S3_METADATA

tests/s3/test_s3_artifacts.py

@@ -9,17 +9,7 @@
 from gardenlinux.s3.s3_artifacts import S3Artifacts
 
 from .conftest import S3Env
-
-RELEASE_DATA = """
-GARDENLINUX_CNAME="container-amd64-1234.1-abc123lo"
-GARDENLINUX_VERSION=1234.1
-GARDENLINUX_COMMIT_ID="abc123lo"
-GARDENLINUX_COMMIT_ID_LONG="abc123long"
-GARDENLINUX_FEATURES="_usi,_trustedboot"
-GARDENLINUX_FEATURES_ELEMENTS=
-GARDENLINUX_FEATURES_FLAGS="_usi,_trustedboot"
-GARDENLINUX_FEATURES_PLATFORMS="container"
-"""
+from .constants import RELEASE_DATA
 
 
 def test_s3artifacts_init_success(s3_setup: S3Env) -> None: