Skip to content

Commit 28b76c9

Browse files
committed
Support cycloneDx format
Signed-off-by: jiyeong.seok <[email protected]>
1 parent f8e339c commit 28b76c9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ numpy>=1.22.2; python_version >= '3.8'
1515
npm
1616
requests
1717
GitPython
18+
cyclonedx-python-lib==8.5.0

src/fosslight_util/output_format.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
from fosslight_util.write_opossum import write_opossum
99
from fosslight_util.write_yaml import write_yaml
1010
from fosslight_util.write_spdx import write_spdx
11+
from fosslight_util.write_cyclonedx import write_cyclonedx
1112
from typing import Tuple
1213

1314
SUPPORT_FORMAT = {'excel': '.xlsx', 'csv': '.csv', 'opossum': '.json', 'yaml': '.yaml',
1415
'spdx-yaml': '.yaml', 'spdx-json': '.json', 'spdx-xml': '.xml',
15-
'spdx-tag': '.tag'}
16+
'spdx-tag': '.tag', 'cyclonedx-json': '.json', 'cyclonedx-xml': '.xml'}
1617

1718

1819
def check_output_format(output='', format='', customized_format={}):
@@ -188,6 +189,8 @@ def write_output_file(output_file_without_ext: str, file_extension: str, scan_it
188189
msg = f'{platform.system()} not support spdx format.'
189190
else:
190191
success, msg, _ = write_spdx(output_file_without_ext, file_extension, scan_item, spdx_version)
192+
elif format.startswith('cyclonedx'):
193+
success, msg, _ = write_cyclonedx(output_file_without_ext, file_extension, scan_item)
191194
else:
192195
if file_extension == '.xlsx':
193196
success, msg = write_result_to_excel(result_file, scan_item, extended_header, hide_header)

0 commit comments

Comments
 (0)