Modify sbom-info.yaml to be available

Author: bjk7119

src/fosslight_oss_pkg/_convert.py

@@ -67,7 +67,7 @@ def convert_report(base_path, output_name, format, need_log_file=True, sheet_nam
             output_yaml = os.path.join(output_path, output_name)
         else:
             output_report = os.path.join(os.path.abspath(output_path), f"FOSSLight-Report_{now}")
-            output_yaml = os.path.join(os.path.abspath(output_path), f"oss-pkg-info_{now}")
+            output_yaml = os.path.join(os.path.abspath(output_path), f"fosslight-sbom-info_{now}")
     else:
         logger.error(f"Format error - {msg}")
         sys.exit(1)
@@ -93,7 +93,7 @@ def convert_report(base_path, output_name, format, need_log_file=True, sheet_nam
                 convert_yml_mode = True
                 file_option_on = True
             else:
-                logger.error("Not support file name or extension - only support for FOSSLight-Report*.xlsx or oss-pkg-info*.yaml file")
+                logger.error("Not support file name or extension")
                 sys.exit(1)
 
     if not convert_yml_mode and not convert_excel_mode:

src/fosslight_prechecker/_constant.py

@@ -7,7 +7,7 @@
                              "pfm", "otf", "afm", "dfont", "json"]
 OSS_PKG_INFO_FILES = [r"oss-pkg-info[\s\S]*.yaml", "oss-pkg-info.yml", r"oss-package[\s\S]*.info", "requirement.txt",
                       "requirements.txt", "package.json", "pom.xml", "build.gradle", "podfile.lock", "cartfile.resolved",
-                      "pubspec.yaml", "package.resolved", "go.mod", r"fosslight-sbom-info[\s\S]*.yaml"]
+                      "pubspec.yaml", "package.resolved", "go.mod", r"fosslight-sbom-info[\s\S]*.yaml", r"sbom-info[\s\S]*.yaml"]
 HTML_RESULT_EXPAND_LIMIT = 10
 HTML_RESULT_PRINT_LIMIT = 100