Fix the logger issue

Signed-off-by: jiyeong.seok <[email protected]>

Author: dd-jy

src/fosslight_util/write_cyclonedx.py

@@ -17,24 +17,28 @@
 from fosslight_util.oss_item import CHECKSUM_NULL, get_checksum_sha1
 from packageurl import PackageURL
 import traceback
-from cyclonedx.builder.this import this_component as cdx_lib_component
-from cyclonedx.exception import MissingOptionalDependencyException
-from cyclonedx.factory.license import LicenseFactory
-from cyclonedx.model import XsUri, ExternalReferenceType
-from cyclonedx.model.bom import Bom
-from cyclonedx.model.component import Component, ComponentType, HashAlgorithm, HashType, ExternalReference
-from cyclonedx.model.contact import OrganizationalEntity
-from cyclonedx.output import make_outputter, BaseOutput
-from cyclonedx.output.json import JsonV1Dot6
-from cyclonedx.schema import OutputFormat, SchemaVersion
-from cyclonedx.validation import make_schemabased_validator
-from cyclonedx.validation.json import JsonStrictValidator
-from cyclonedx.output.json import Json as JsonOutputter
-from cyclonedx.output.xml import Xml as XmlOutputter
-from cyclonedx.validation.xml import XmlValidator
 
 logger = logging.getLogger(LOGGER_NAME)
 
+try:
+    from cyclonedx.builder.this import this_component as cdx_lib_component
+    from cyclonedx.exception import MissingOptionalDependencyException
+    from cyclonedx.factory.license import LicenseFactory
+    from cyclonedx.model import XsUri, ExternalReferenceType
+    from cyclonedx.model.bom import Bom
+    from cyclonedx.model.component import Component, ComponentType, HashAlgorithm, HashType, ExternalReference
+    from cyclonedx.model.contact import OrganizationalEntity
+    from cyclonedx.output import make_outputter, BaseOutput
+    from cyclonedx.output.json import JsonV1Dot6
+    from cyclonedx.schema import OutputFormat, SchemaVersion
+    from cyclonedx.validation import make_schemabased_validator
+    from cyclonedx.validation.json import JsonStrictValidator
+    from cyclonedx.output.json import Json as JsonOutputter
+    from cyclonedx.output.xml import Xml as XmlOutputter
+    from cyclonedx.validation.xml import XmlValidator
+except Exception:
+    logger.info('No import cyclonedx-python-lib')
+
 
 def write_cyclonedx(output_file_without_ext, output_extension, scan_item):
     success = True

tests/conftest.py

@@ -36,6 +36,7 @@ def scan_item():
     scan_item.set_cover_comment('This is a test comment')
 
     file_item = FileItem('test_result/excel_and_csv')
+    file_item.checksum = 'af969fc2085b1bb6d31e517d5c456def5cdd7093'
 
     oss_item = OssItem("test_name1", "1.0.0", "Apache-2.0", "https://abc.com")
     oss_item.comment = "test_name comment"

tests/test_cyclonedx.py

@@ -0,0 +1,20 @@
+# Copyright (c) 2021 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+import os
+
+from fosslight_util.write_cyclonedx import write_cyclonedx
+from tests import constants
+
+
+def test_cyclonedx(scan_item):
+    # given
+    output_dir = os.path.join(constants.TEST_RESULT_DIR, "cyclonedx")
+    filename_with_dir = os.path.join(output_dir, "FL-TEST_cyclonedx.json")
+
+    # when
+    success, err_msg, _ = write_cyclonedx(filename_with_dir.split('.')[0], '.json', scan_item)
+
+    # then
+    assert success is True
+    assert len(os.listdir(output_dir)) > 0