Skip to content

fix(hermeto): better handle flags: None #2175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinBasti merged 1 commit into from
Apr 30, 2025
Merged

fix(hermeto): better handle flags: None #2175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 atomic_reactor/plugins/hermeto_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def process_remote_sources(self) -> List[Dict[str, Any]]:
remote_source["git_submodules"] = git_submodules

remove_unsafe_symlinks = False
flags = remote_source_data.get("flags", [])
flags = remote_source_data.get("flags") or []
if "remove-unsafe-symlinks" in flags:
remove_unsafe_symlinks = True

Expand Down
4 changes: 2 additions & 2 deletions atomic_reactor/utils/hermeto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def remote_source_to_hermeto(remote_source: Dict[str, Any]) -> Dict[str, Any]:
removed_pkg_managers = {"git-submodule"}

hermeto_flags = sorted(
set(remote_source.get("flags", [])) - removed_flags
set(remote_source.get("flags") or []) - removed_flags
)
hermeto_packages = []

Expand Down Expand Up @@ -280,7 +280,7 @@ def generate_request_json(
"ref": remote_source["ref"],
"repo": remote_source["repo"],
"environment_variables": {env['name']: env["value"] for env in remote_source_env_json},
"flags": remote_source.get("flags", []),
"flags": remote_source.get("flags") or [],
"packages": [], # this will be always empty Hermeto doesn't provide nested deps
}
return res
Expand Down
2 changes: 2 additions & 0 deletions tests/plugins/test_hermeto_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ def test_multi_remote_source_initialization(workflow, mocked_hermeto_init):
remote_source:
repo: {SECOND_REMOTE_SOURCE_REPO}
ref: {SECOND_REMOTE_SOURCE_REF}
flags: # Test case when flags are None to test handling
"""
)

Expand Down Expand Up @@ -301,6 +302,7 @@ def test_multi_remote_source_initialization(workflow, mocked_hermeto_init):
"repo": SECOND_REMOTE_SOURCE_REPO,
"ref": SECOND_REMOTE_SOURCE_REF,
"pkg_managers": ["gomod"],
"flags": None,
}
}]

Expand Down