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/__main__.py

@@ -23,6 +23,7 @@
     "commit_id",
     "features",
     "platform",
+    "platforms",
     "flags",
     "flavor",
     "elements",
@@ -143,6 +144,7 @@ def main() -> None:
         "flavor",
         "graph",
         "platform",
+        "platforms",
     ):
         if args.type == "graph" or len(args.ignore) > 0:
             features_parser = Parser(gardenlinux_root, feature_dir_name)
@@ -255,13 +257,15 @@ def additional_filter_func(node):
                 flavor, additional_filter_func=additional_filter_func
             )
         )
-    elif output_type in ("platform", "elements", "flags"):
+    elif output_type in ("platform", "platforms", "elements", "flags"):
         features_by_type = parser.filter_as_dict(
             flavor, additional_filter_func=additional_filter_func
         )
 
         if output_type == "platform":
             print(features_by_type["platform"][0])
+        if output_type == "platforms":
+            print(",".join(features_by_type["platform"]))
         elif output_type == "elements":
             print(",".join(features_by_type["element"]))
         elif output_type == "flags":
@@ -290,12 +294,6 @@ def additional_filter_func(node):
             print(cname)
         elif output_type == "container_name":
             print(RE_CAMEL_CASE_SPLITTER.sub("\\1_\\2", cname_base).lower())
-        elif output_type == "platform":
-            print(features_by_type["platform"][0])
-        elif output_type == "elements":
-            print(",".join(features_by_type["element"]))
-        elif output_type == "flags":
-            print(",".join(features_by_type["flag"]))
         elif output_type == "graph":
             print(graph_as_mermaid_markup(flavor, graph))
 
@@ -328,6 +326,8 @@ def print_output_from_cname(output_type: str, cname_instance: CName) -> None:
     elif output_type == "container_name":
         print(RE_CAMEL_CASE_SPLITTER.sub("\\1-\\2", cname_instance.flavor).lower())
     elif output_type == "platform":
+        print(cname_instance.platform)
+    elif output_type == "platforms":
         print(cname_instance.feature_set_platform)
     elif output_type == "elements":
         print(cname_instance.feature_set_element)

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,7 +314,8 @@ def release_metadata_string(self) -> str:
 
         elements = ",".join(features["element"])
         flags = ",".join(features["flag"])
-        platform = ",".join(features["platform"])
+        platform = features["platform"][0]
+        platforms = ",".join(features["platform"])
         platform_variant = self.platform_variant
 
         if platform_variant is None:
@@ -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}"

tests/s3/test_s3_artifacts.py

@@ -9,14 +9,14 @@
 from gardenlinux.s3.s3_artifacts import S3Artifacts
 
 RELEASE_DATA = """
-    GARDENLINUX_CNAME = container-amd64-1234.1-abc123
-    GARDENLINUX_VERSION = 1234.1
-    GARDENLINUX_COMMIT_ID = abc123
-    GARDENLINUX_COMMIT_ID_LONG = abc123long
-    GARDENLINUX_FEATURES = _usi,_trustedboot
-    GARDENLINUX_FEATURES_ELEMENTS =
-    GARDENLINUX_FEATURES_FLAGS = _usi,_trustedboot
-    GARDENLINUX_FEATURES_PLATFORM = container
+    GARDENLINUX_CNAME="container-amd64-1234.1-abc123"
+    GARDENLINUX_VERSION=1234.1
+    GARDENLINUX_COMMIT_ID="abc123"
+    GARDENLINUX_COMMIT_ID_LONG="abc123long"
+    GARDENLINUX_FEATURES="_usi,_trustedboot"
+    GARDENLINUX_FEATURES_ELEMENTS=
+    GARDENLINUX_FEATURES_FLAGS="_usi,_trustedboot"
+    GARDENLINUX_FEATURES_PLATFORMS="container"
     """