Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Installs the given GardenLinux Python library
inputs:
version:
description: GardenLinux Python library version
default: "0.10.11"
default: "0.10.12"
python_version:
description: Python version to setup
default: "3.13"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "gardenlinux"
version = "0.10.11"
version = "0.10.12"
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"
Expand Down
14 changes: 14 additions & 0 deletions src/gardenlinux/features/cname.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,20 @@ def feature_set_platform(self) -> str:
"Only one platform is supported"
return platforms[0]

@property
def feature_set_list(self) -> List[str]:
"""
Returns the feature set for the cname parsed.

:return: (list) Feature set list of the cname
:since: 0.10.12
"""

if self._feature_set_cached is not None:
return self._feature_set_cached.split(",")

return Parser().filter_as_list(self.flavor)

@property
def platform(self) -> str:
"""
Expand Down
8 changes: 4 additions & 4 deletions src/gardenlinux/s3/s3_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def upload_from_directory(
)

arch = cname_object.arch
feature_list = cname_object.feature_set
feature_set_list = cname_object.feature_set_list
release_timestamp = stat(release_file).st_ctime
requirements_file = artifacts_dir.joinpath(f"{base_name}.requirements")
require_uefi = None
Expand All @@ -155,10 +155,10 @@ def upload_from_directory(
)

if require_uefi is None:
require_uefi = "_usi" in feature_list
require_uefi = "_usi" in feature_set_list

if secureboot is None:
secureboot = "_trustedboot" in feature_list
secureboot = "_trustedboot" in feature_set_list

# RegEx for S3 supported characters
re_object = re.compile("[^a-zA-Z0-9\\s+\\-=.\\_:/@]")
Expand All @@ -182,7 +182,7 @@ def upload_from_directory(
"build_timestamp": datetime.fromtimestamp(release_timestamp).isoformat(),
"gardenlinux_epoch": version_epoch,
"logs": None,
"modifiers": cname_object.feature_set,
"modifiers": feature_set_list,
"require_uefi": require_uefi,
"secureboot": secureboot,
"published_image_metadata": None,
Expand Down
4 changes: 3 additions & 1 deletion tests/s3/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
build_timestamp: '{build_timestamp}'
gardenlinux_epoch: '1234'
logs: null
modifiers: _usi,_trustedboot
modifiers:
- _usi
- _trustedboot
require_uefi: true
secureboot: true
published_image_metadata: null
Expand Down