Add support to generate container tags based on given version input

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

Author: NotTheEvilOne

src/gardenlinux/features/__main__.py

@@ -20,6 +20,7 @@
     "cname",
     "cname_base",
     "container_name",
+    "container_tag",
     "commit_id",
     "features",
     "platforms",
@@ -37,6 +38,7 @@
 CamelCase splitter RegExp
 """
 
+
 def main() -> None:
     """
     gl-features-parse main()
@@ -109,15 +111,26 @@ def main() -> None:
         commit_id_or_hash = cname.commit_id
         version = cname.version
 
-    if arch is None or arch == "" and (args.type in ("cname", "container_name", "arch")):
+    if (arch is None or arch == "") and (
+        args.type in ("cname", "container_name", "arch")
+    ):
         raise RuntimeError(
             "Architecture could not be determined and no default architecture set"
         )
 
-    if (
-        version is None
-        or version == ""
-        and (args.type in ("cname", "commit_id", "version", "version_and_commit_id"))
+    if (commit_id_or_hash is None or commit_id_or_hash == "") and (
+        args.type in ("container_tag", "commit_id", "version_and_commit_id")
+    ):
+        raise RuntimeError("Commit ID not specified")
+
+    if (version is None or version == "") and (
+        args.type
+        in (
+            "container_tag",
+            "commit_id",
+            "version",
+            "version_and_commit_id",
+        )
     ):
         raise RuntimeError("Version not specified and no default version set")
 
@@ -136,7 +149,7 @@ def main() -> None:
         "graph",
         "platforms",
     ):
-        if args.type == "graph" or len(args.ignore) > 1:
+        if args.type == "graph" or len(args.ignore) > 0:
             features_parser = Parser(gardenlinux_root, feature_dir_name)
 
             print_output_from_features_parser(
@@ -146,6 +159,8 @@ def main() -> None:
             print_output_from_cname(args.type, cname)
     elif args.type == "commit_id":
         print(commit_id_or_hash[:8])
+    elif args.type == "container_tag":
+        print(re.sub("\\W+", "-", f"{version}-{commit_id_or_hash[:8]}"))
     elif args.type == "version":
         print(version)
     elif args.type == "version_and_commit_id":

src/gardenlinux/features/parser.py

@@ -30,15 +30,15 @@ class Parser(object):
                  Apache License, Version 2.0
     """
 
-    _GARDENLINUX_ROOT: str = "."
+    _GARDENLINUX_ROOT: str = os.getenv("GL_ROOT_DIR", ".")
     """
     Default GardenLinux root directory
     """
 
     def __init__(
         self,
-        gardenlinux_root: str | None = None,
-        feature_dir_name: str = "features",
+        gardenlinux_root: Optional[str] = None,
+        feature_dir_name: Optional[str] = "features",
         logger: Optional[logging.Logger] = None,
     ):
         """

tests/features/test_main.py

@@ -4,7 +4,9 @@
 import pytest
 
 import gardenlinux.features.__main__ as fema
-from gardenlinux.features import CName
+from gardenlinux.features import CName, Parser
+
+from ..constants import GL_ROOT_DIR
 
 # -------------------------------
 # Helper function tests
@@ -148,7 +150,16 @@ def test_main_prints_arch(monkeypatch, capsys):
 
 def test_main_prints_container_name(monkeypatch, capsys):
     # Arrange
-    argv = ["prog", "--arch", "amd64", "--cname", "container-pythonDev", "--version", "1.0", "container_name"]
+    argv = [
+        "prog",
+        "--arch",
+        "amd64",
+        "--cname",
+        "container-pythonDev",
+        "--version",
+        "1.0",
+        "container_name",
+    ]
     monkeypatch.setattr(sys, "argv", argv)
     monkeypatch.setattr(fema, "Parser", lambda *a, **kw: None)
 
@@ -160,6 +171,31 @@ def test_main_prints_container_name(monkeypatch, capsys):
     assert "container-python-dev" in out
 
 
+def test_main_prints_container_tag(monkeypatch, capsys):
+    # Arrange
+    argv = [
+        "prog",
+        "--arch",
+        "amd64",
+        "--cname",
+        "flav",
+        "--version",
+        "1.0",
+        "--commit",
+        "~post1",
+        "container_tag",
+    ]
+    monkeypatch.setattr(sys, "argv", argv)
+    monkeypatch.setattr(fema, "Parser", lambda *a, **kw: None)
+
+    # Act
+    fema.main()
+
+    # Assert
+    out = capsys.readouterr().out.strip()
+    assert "1-0-post1" == out
+
+
 def test_main_prints_commit_id(monkeypatch, capsys):
     # Arrange
     argv = ["prog", "--arch", "amd64", "--cname", "flav", "commit_id"]
@@ -252,14 +288,49 @@ def test_main_prints_version_and_commit_id(monkeypatch, capsys):
     assert "1.2.3-abcdef12" == captured.out.strip()
 
 
-def test_main_arch_raises_missing_verison(monkeypatch, capsys):
+def test_main_requires_cname(monkeypatch):
+    # Arrange
+    monkeypatch.setattr(sys, "argv", ["prog", "arch"])
+    monkeypatch.setattr(fema, "Parser", lambda *a, **kw: None)
+
+    # Act / Assert
+    with pytest.raises(SystemExit):
+        fema.main()
+
+
+def test_main_raises_no_arch_no_default(monkeypatch):
+    # Arrange
+    # args.type == 'cname, arch is None and no default_arch set
+    argv = ["prog", "--cname", "flav", "cname"]
+    monkeypatch.setattr(sys, "argv", argv)
+    monkeypatch.setattr(
+        fema,
+        "Parser",
+        lambda *a, **kw: types.SimpleNamespace(filter=lambda *a, **k: None),
+    )
+
+    # Act / Assert
+    with pytest.raises(RuntimeError, match="Architecture could not be determined"):
+        fema.main()
+
+
+def test_main_raises_missing_commit_id(monkeypatch, capsys):
     # Arrange
-    argv = ["prog", "--arch", "amd64", "--cname", "flav", "arch"]
+    argv = [
+        "prog",
+        "--arch",
+        "amd64",
+        "--cname",
+        "flav",
+        "--version",
+        "1.0",
+        "version_and_commit_id",
+    ]
     monkeypatch.setattr(sys, "argv", argv)
     monkeypatch.setattr(fema, "Parser", lambda *a, **kw: None)
 
     # Act / Assert
-    with pytest.raises(RuntimeError):
+    with pytest.raises(RuntimeError, match="Commit ID not specified"):
         fema.main()
 
 
@@ -302,27 +373,36 @@ def sort_subset(subset, length):
     assert "flav" in captured.out
 
 
-def test_main_requires_cname(monkeypatch):
+def test_main_with_exclude_cname_print_cname(monkeypatch, capsys):
     # Arrange
-    monkeypatch.setattr(sys, "argv", ["prog", "arch"])
-    monkeypatch.setattr(fema, "Parser", lambda *a, **kw: None)
+    monkeypatch.setattr(
+        sys,
+        "argv",
+        [
+            "prog",
+            "--feature-dir",
+            f"{GL_ROOT_DIR}/features",
+            "--cname",
+            "kvm-gardener_prod",
+            "--ignore",
+            "cloud",
+            "--arch",
+            "amd64",
+            "--version",
+            "local",
+            "--commit",
+            "today",
+            "features",
+        ],
+    )
 
-    # Act / Assert
-    with pytest.raises(SystemExit):
-        fema.main()
+    # Act
+    fema.main()
 
+    # Assert
+    captured = capsys.readouterr().out.strip()
 
-def test_main_raises_no_arch_no_default(monkeypatch):
-    # Arrange
-    # args.type == 'cname, arch is None and no default_arch set
-    argv = ["prog", "--cname", "flav", "cname"]
-    monkeypatch.setattr(sys, "argv", argv)
-    monkeypatch.setattr(
-        fema,
-        "Parser",
-        lambda *a, **kw: types.SimpleNamespace(filter=lambda *a, **k: None),
+    assert (
+        "log,sap,ssh,_boot,_ignite,kvm,_nopkg,_prod,_slim,base,server,gardener"
+        == captured
     )
-
-    # Act / Assert
-    with pytest.raises(RuntimeError, match="Architecture could not be determined"):
-        fema.main()

tests/s3/test_s3_artifacts.py

@@ -120,8 +120,10 @@ def test_upload_from_directory_success(s3_setup):
     assert metadata["require_uefi"] is True
     assert metadata["secureboot"] is True
 
-    raw_tags_response = env.s3.meta.client.get_object_tagging(Bucket=env.bucket_name, Key=f"objects/{env.cname}/{env.cname}-file1")
-    tags = { tag['Key']: tag['Value'] for tag in raw_tags_response["TagSet"] }
+    raw_tags_response = env.s3.meta.client.get_object_tagging(
+        Bucket=env.bucket_name, Key=f"objects/{env.cname}/{env.cname}-file1"
+    )
+    tags = {tag["Key"]: tag["Value"] for tag in raw_tags_response["TagSet"]}
     assert tags["platform"] == "container+kvm"
 
 
@@ -260,6 +262,7 @@ def test_upload_from_directory_invalid_artifact_name(s3_setup):
     bucket = env.s3.Bucket(env.bucket_name)
     assert len(list(bucket.objects.filter(Prefix=f"meta/singles/{env.cname}"))) == 1
 
+
 def test_upload_from_directory_commit_mismatch_raises(s3_setup):
     """Raise RuntimeError when commit ID is not matching with cname."""
     # Arrange