feat: ES-213 Fix wfp scanoss settings bug

Author: matiasdaloia

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `--container` flag to `dependency` subcommand to scan dependencies in container images.
 ### Modified
 - Refactor CLI argument handling for output and format options.
+### Fixed
+- Fixed issue with wfp command where settings file was being loaded from the cwd instead of the scan root directory
 
 ## [1.21.0] - 2025-03-27
 ### Added

src/scanoss/cli.py

@@ -844,7 +844,7 @@ def wfp(parser, args):
     if not args.skip_settings_file:
         scan_settings = ScanossSettings(debug=args.debug, trace=args.trace, quiet=args.quiet)
         try:
-            scan_settings.load_json_file(args.settings)
+            scan_settings.load_json_file(args.settings, args.scan_dir)
         except ScanossSettingsError as e:
             print_stderr(f'Error: {e}')
             sys.exit(1)

src/scanoss/scanoss_settings.py

@@ -24,13 +24,17 @@
 
 import json
 from pathlib import Path
-from typing import List, TypedDict
+from typing import List, Optional, TypedDict
 
 import importlib_resources
 from jsonschema import validate
 
 from .scanossbase import ScanossBase
-from .utils.file import JSON_ERROR_FILE_NOT_FOUND, JSON_ERROR_FILE_EMPTY, validate_json_file
+from .utils.file import (
+    JSON_ERROR_FILE_EMPTY,
+    JSON_ERROR_FILE_NOT_FOUND,
+    validate_json_file,
+)
 
 DEFAULT_SCANOSS_JSON_FILE = Path('scanoss.json')
 
@@ -96,7 +100,7 @@ def __init__(
         if filepath:
             self.load_json_file(filepath)
 
-    def load_json_file(self, filepath: 'str | None' = None, scan_root: 'str | None' = None) -> 'ScanossSettings':
+    def load_json_file(self, filepath: Optional[str] = None, scan_root: Optional[str] = None) -> 'ScanossSettings':
         """
         Load the scan settings file. If no filepath is provided, scanoss.json will be used as default.
 
@@ -118,7 +122,7 @@ def load_json_file(self, filepath: 'str | None' = None, scan_root: 'str | None'
 
         result = validate_json_file(json_file)
         if not result.is_valid:
-            if result.error_code == JSON_ERROR_FILE_NOT_FOUND or result.error_code == JSON_ERROR_FILE_EMPTY:
+            if result.error_code in (JSON_ERROR_FILE_NOT_FOUND, JSON_ERROR_FILE_EMPTY):
                 self.print_msg(
                     f'WARNING: The supplied settings file "{filepath}" was not found or is empty. Skipping...'
                 )
@@ -235,7 +239,7 @@ def _get_sbom_assets(self):
             include_bom_entries = self._remove_duplicates(self.normalize_bom_entries(self.get_bom_include()))
             replace_bom_entries = self._remove_duplicates(self.normalize_bom_entries(self.get_bom_replace()))
             self.print_debug(
-                f"Scan type set to 'identify'. Adding {len(include_bom_entries) + len(replace_bom_entries)} components as context to the scan. \n"
+                f"Scan type set to 'identify'. Adding {len(include_bom_entries) + len(replace_bom_entries)} components as context to the scan. \n"  # noqa: E501
                 f'From Include list: {[entry["purl"] for entry in include_bom_entries]} \n'
                 f'From Replace list: {[entry["purl"] for entry in replace_bom_entries]} \n'
             )