From c70ea9a0167428a8449f03a659e2501645b63e49 Mon Sep 17 00:00:00 2001 From: "jiyeong.seok" Date: Thu, 28 Nov 2024 21:45:37 +0900 Subject: [PATCH] Support cycloneDX format Signed-off-by: jiyeong.seok --- requirements.txt | 2 +- src/fosslight_dependency/run_dependency_scanner.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index f31054c3..bfc81e8c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ lxml virtualenv pyyaml lastversion -fosslight_util>=2.1.0 +fosslight_util>=2.1.6 PyGithub requirements-parser defusedxml diff --git a/src/fosslight_dependency/run_dependency_scanner.py b/src/fosslight_dependency/run_dependency_scanner.py index 3eaf4107..6d3b1466 100755 --- a/src/fosslight_dependency/run_dependency_scanner.py +++ b/src/fosslight_dependency/run_dependency_scanner.py @@ -128,12 +128,15 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='', to_remove = [] # elements of spdx format on windows that should be removed for i, output_extension in enumerate(output_extensions): if formats: - if formats[i].startswith('spdx'): - if platform.system() != 'Windows': - output_files[i] = f"fosslight_spdx_dep_{_start_time}" - else: - logger.warning('spdx format is not supported on Windows. Please remove spdx from format.') + if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'): + if platform.system() == 'Windows': + logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.') to_remove.append(i) + else: + if formats[i].stasrtswith('spdx'): + output_files[i] = f"fosslight_spdx_dep_{_start_time}" + elif formats[i].startswith('cyclonedx'): + output_files[i] = f'fosslight_cyclonedx_dep_{_start_time}' else: if output_extension == _json_ext: output_files[i] = f"fosslight_opossum_dep_{_start_time}"