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
16 changes: 0 additions & 16 deletions cdxev/auxiliary/sbomFunctions.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,6 @@ def get_component_by_ref(ref: str, list_of_components: Sequence[dict]) -> dict:
return {}


def get_bom_refs_from_components(list_of_components: Sequence[dict]) -> list:
"""
Function that gets a list of components and returns a list with their sboms

Input:
list_of_components: list with dicts of components

Output:
list_of_bom_refs: List of Strings, containing the bom-refs of the components
"""
list_of_bom_refs = []
for component in list_of_components:
list_of_bom_refs.append(component.get("bom-ref", ""))
return list_of_bom_refs


def get_bom_refs_from_dependencies(dependencies: Sequence[dict]) -> list[str]:
"""
Function that gets a list of dependencies and returns a list with their sboms
Expand Down
8 changes: 4 additions & 4 deletions cdxev/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
compare_time_flag_from_vulnerabilities,
compare_vulnerabilities,
copy_ratings,
get_bom_refs_from_components,
get_bom_refs_from_dependencies,
get_corresponding_reference_to_component,
get_dependency_by_ref,
get_ref_from_components,
)
from cdxev.log import LogMessage

Expand All @@ -36,7 +36,7 @@ def merge_components(governing_sbom: dict, sbom_to_be_merged: dict) -> t.List[di
"""
list_of_merged_components = governing_sbom.get("components", [])
list_of_added_components = sbom_to_be_merged.get("components", [])
list_of_merged_bom_refs = get_bom_refs_from_components(list_of_merged_components)
list_of_merged_bom_refs = get_ref_from_components(list_of_merged_components)
for component in list_of_added_components:
is_in_list, bom_ref_from_list = get_corresponding_reference_to_component(
component, list_of_merged_components
Expand Down Expand Up @@ -70,7 +70,7 @@ def merge_components(governing_sbom: dict, sbom_to_be_merged: dict) -> t.List[di
else:
# if the bom-ref already exists in the components, add a incrementing number to
# the bom-ref
list_of_bom_refs_to_be_added = get_bom_refs_from_components(
list_of_bom_refs_to_be_added = get_ref_from_components(
sbom_to_be_merged.get("components", [])
)
list_of_bom_refs_to_be_added.append(
Expand Down Expand Up @@ -413,7 +413,7 @@ def replace_ref_in_sbom(
True if replacement succesfull, false, if the new_reference
already exists in the sbom
"""
list_of_bom_refs = get_bom_refs_from_components(sbom.get("components", []))
list_of_bom_refs = get_ref_from_components(sbom.get("components", []))
list_of_bom_refs.append(
sbom.get("metadata", {}).get("component", {}).get("bom-ref", "")
)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ def test_replace_licenses(self) -> None:
if component["bom-ref"] != "sp_fifteenth_component"
]
sbom["vulnerabilities"] = dictionary_with_stuff["vulnerabilities_tls_equal"]
list_of_bom_refs = sbF.get_bom_refs_from_components(sbom.get("components", []))
list_of_bom_refs = sbF.get_ref_from_components(sbom.get("components", []))
sbom_bom_refs_replaced = load_additional_sbom_dict()[
"sbom_with_bom_refs_replaced"
]
Expand Down