Differentiate platform and platforms in the GardenLinux canonical name

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

Author: NotTheEvilOne

src/gardenlinux/features/cname.py

@@ -51,7 +51,7 @@ def __init__(self, cname, arch=None, commit_hash=None, version=None):
         self._commit_id = None
         self._feature_elements_cached = None
         self._feature_flags_cached = None
-        self._feature_platform_cached = None
+        self._feature_platforms_cached = None
         self._feature_set_cached = None
         self._platform_variant_cached = None
 
@@ -239,10 +239,10 @@ def feature_set_platform(self) -> str:
         :since:  1.0.0
         """
 
-        if self._feature_platform_cached is not None:
-            return self._feature_platform_cached
-
-        platforms = Parser().filter_as_dict(self.flavor)["platform"]
+        if self._feature_platforms_cached is None:
+            platforms = Parser().filter_as_dict(self.flavor)["platform"]
+        else:
+            platforms = self._feature_platforms_cached
 
         if self._flag_multiple_platforms:
             return ",".join(platforms)
@@ -260,7 +260,15 @@ def platform(self) -> str:
         :since:  0.7.0
         """
 
-        return self.feature_set_platform
+        if self._feature_platforms_cached is None:
+            platforms = Parser().filter_as_dict(self.flavor)["platform"]
+        else:
+            platforms = self._feature_platforms_cached
+
+        if not self._flag_multiple_platforms:
+            assert len(platforms) < 2
+
+        return platforms[0]
 
     @property
     def platform_variant(self) -> Optional[str]:
@@ -306,8 +314,9 @@ def release_metadata_string(self) -> str:
 
         elements = ",".join(features["element"])
         flags = ",".join(features["flag"])
-        platform = ",".join(features["platform"])
+        platform = features["platform"][0]
         platform_variant = self.platform_variant
+        platforms = ",".join(features["platform"])
 
         if platform_variant is None:
             platform_variant = ""
@@ -323,9 +332,10 @@ def release_metadata_string(self) -> str:
 BUG_REPORT_URL="{GL_BUG_REPORT_URL}"
 GARDENLINUX_CNAME="{self.cname}"
 GARDENLINUX_FEATURES="{self.feature_set}"
-GARDENLINUX_FEATURES_PLATFORM="{platform}"
+GARDENLINUX_FEATURES_PLATFORMS="{platforms}"
 GARDENLINUX_FEATURES_ELEMENTS="{elements}"
 GARDENLINUX_FEATURES_FLAGS="{flags}"
+GARDENLINUX_PLATFORM="{platform}"
 GARDENLINUX_PLATFORM_VARIANT="{platform_variant}"
 GARDENLINUX_VERSION="{self.version}"
 GARDENLINUX_COMMIT_ID="{self.commit_id}"
@@ -384,7 +394,7 @@ def load_from_release_file(self, release_file: PathLike | str) -> None:
             "GARDENLINUX_FEATURES",
             "GARDENLINUX_FEATURES_ELEMENTS",
             "GARDENLINUX_FEATURES_FLAGS",
-            "GARDENLINUX_FEATURES_PLATFORM",
+            "GARDENLINUX_FEATURES_PLATFORMS",
             "GARDENLINUX_VERSION",
         ):
             if not release_config.has_option(UNNAMED_SECTION, release_field):
@@ -439,9 +449,11 @@ def load_from_release_file(self, release_file: PathLike | str) -> None:
             .split(",")
         )
 
-        self._feature_platform_cached = release_config.get(
-            UNNAMED_SECTION, "GARDENLINUX_FEATURES_PLATFORM"
-        ).strip("\"'")
+        self._feature_platforms_cached = (
+            release_config.get(UNNAMED_SECTION, "GARDENLINUX_FEATURES_PLATFORMS")
+            .strip("\"'")
+            .split(",")
+        )
 
         if release_config.has_option(UNNAMED_SECTION, "GARDENLINUX_PLATFORM_VARIANT"):
             self._platform_variant_cached = release_config.get(

tests/features/constants.py

@@ -19,9 +19,10 @@ def generate_container_amd64_release_metadata(version, commit_hash):
 BUG_REPORT_URL="{GL_BUG_REPORT_URL}"
 GARDENLINUX_CNAME="container-amd64-{version}-{commit_hash}"
 GARDENLINUX_FEATURES="_slim,base,container"
-GARDENLINUX_FEATURES_PLATFORM="container"
+GARDENLINUX_FEATURES_PLATFORMS="container"
 GARDENLINUX_FEATURES_ELEMENTS="base"
 GARDENLINUX_FEATURES_FLAGS="_slim"
+GARDENLINUX_PLATFORM="container"
 GARDENLINUX_PLATFORM_VARIANT=""
 GARDENLINUX_VERSION="{version}"
 GARDENLINUX_COMMIT_ID="{commit_hash}"