Skip to content

Commit 0ae8233

Browse files
committed
fix(d2d): add **kwargs to pipe functions for pipeline compatibility
1 parent 586d59e commit 0ae8233

File tree

1 file changed

+38
-28
lines changed

1 file changed

+38
-28
lines changed

scanpipe/pipes/d2d.py

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def _map_checksum_resource(to_resource, from_resources, checksum_field):
139139
)
140140

141141

142-
def map_checksum(project, checksum_field, logger=None, to_queryset=None):
142+
def map_checksum(project, checksum_field, logger=None, to_queryset=None, **kwargs):
143143
"""Map using checksum."""
144144
project_files = project.codebaseresources.files().no_status()
145145
from_resources = project_files.from_codebase().has_value(checksum_field)
@@ -196,7 +196,9 @@ def _map_jvm_to_class_resource(
196196
)
197197

198198

199-
def map_jvm_to_class(project, jvm_lang: jvm.JvmLanguage, logger=None, to_queryset=None):
199+
def map_jvm_to_class(
200+
project, jvm_lang: jvm.JvmLanguage, logger=None, to_queryset=None, **kwargs
201+
):
200202
"""
201203
Map to/ compiled Jvm's binary files to from/ using Jvm language's fully
202204
qualified paths and indexing from/ Jvm lang's source files.
@@ -348,7 +350,9 @@ def _map_jar_to_jvm_source_resource(
348350
)
349351

350352

351-
def map_jar_to_jvm_source(project, jvm_lang: jvm.JvmLanguage, logger=None, to_queryset=None):
353+
def map_jar_to_jvm_source(
354+
project, jvm_lang: jvm.JvmLanguage, logger=None, to_queryset=None, **kwargs
355+
):
352356
"""Map .jar files to their related source directory."""
353357
project_files = project.codebaseresources.files()
354358
# Include the directories to map on the common source
@@ -415,7 +419,7 @@ def _map_path_resource(
415419
)
416420

417421

418-
def map_path(project, logger=None, to_queryset=None):
422+
def map_path(project, logger=None, to_queryset=None, **kwargs):
419423
"""Map using path suffix similarities."""
420424
project_files = project.codebaseresources.files().no_status()
421425
from_resources = project_files.from_codebase()
@@ -620,7 +624,13 @@ def match_sha1s_to_purldb(
620624

621625

622626
def match_purldb_resources(
623-
project, extensions, matcher_func, chunk_size=1000, logger=None, to_queryset=None
627+
project,
628+
extensions,
629+
matcher_func,
630+
chunk_size=1000,
631+
logger=None,
632+
to_queryset=None,
633+
**kwargs,
624634
):
625635
"""
626636
Match against PurlDB selecting codebase resources using provided
@@ -758,7 +768,7 @@ def match_purldb_directories(project, logger=None, to_queryset=None):
758768
)
759769

760770

761-
def map_javascript(project, logger=None, to_queryset=None):
771+
def map_javascript(project, logger=None, to_queryset=None, **kwargs):
762772
"""Map a packed or minified JavaScript, TypeScript, CSS and SCSS to its source."""
763773
project_files = project.codebaseresources.files()
764774

@@ -1035,7 +1045,7 @@ def create_about_packages_relations(self, project):
10351045
return about_purls, mapped_about_resources
10361046

10371047

1038-
def map_about_files(project, logger=None, to_queryset=None):
1048+
def map_about_files(project, logger=None, to_queryset=None, **kwargs):
10391049
"""Map ``from/`` .ABOUT files to their related ``to/`` resources."""
10401050
project_resources = project.codebaseresources
10411051
from_about_files = (
@@ -1080,7 +1090,7 @@ def map_about_files(project, logger=None, to_queryset=None):
10801090
)
10811091

10821092

1083-
def map_javascript_post_purldb_match(project, logger=None, to_queryset=None):
1093+
def map_javascript_post_purldb_match(project, logger=None, to_queryset=None, **kwargs):
10841094
"""Map minified javascript file based on existing PurlDB match."""
10851095
project_files = project.codebaseresources.files()
10861096

@@ -1149,7 +1159,7 @@ def _map_javascript_post_purldb_match_resource(
11491159
to_minified.update(status=flag.MAPPED)
11501160

11511161

1152-
def map_javascript_path(project, logger=None, to_queryset=None):
1162+
def map_javascript_path(project, logger=None, to_queryset=None, **kwargs):
11531163
"""Map javascript file based on path."""
11541164
project_files = project.codebaseresources.files()
11551165

@@ -1241,7 +1251,7 @@ def _map_javascript_path_resource(
12411251
)
12421252

12431253

1244-
def map_javascript_colocation(project, logger=None, to_queryset=None):
1254+
def map_javascript_colocation(project, logger=None, to_queryset=None, **kwargs):
12451255
"""Map JavaScript files based on neighborhood file mapping."""
12461256
project_files = project.codebaseresources.files()
12471257

@@ -1332,7 +1342,7 @@ def _map_javascript_colocation_resource(
13321342
)
13331343

13341344

1335-
def flag_processed_archives(project, to_queryset=None):
1345+
def flag_processed_archives(project, logger=None, to_queryset=None, **kwargs):
13361346
"""
13371347
Flag package archives as processed if they meet the following criteria:
13381348
@@ -1362,7 +1372,7 @@ def flag_processed_archives(project, to_queryset=None):
13621372
archive_resource.update(status=flag.ARCHIVE_PROCESSED)
13631373

13641374

1365-
def map_thirdparty_npm_packages(project, logger=None, to_queryset=None):
1375+
def map_thirdparty_npm_packages(project, logger=None, to_queryset=None, **kwargs):
13661376
"""Map thirdparty package using package.json metadata."""
13671377
project_files = project.codebaseresources.files()
13681378

@@ -1473,7 +1483,7 @@ def create_local_files_packages(project):
14731483
pipes.create_local_files_package(project, defaults, codebase_resource_ids)
14741484

14751485

1476-
def match_resources_with_no_java_source(project, logger=None, to_queryset=None):
1486+
def match_resources_with_no_java_source(project, logger=None, to_queryset=None, **kwargs):
14771487
"""
14781488
Match resources with ``no-java-source`` to PurlDB, if no match
14791489
is found update status to ``requires-review``.
@@ -1505,7 +1515,7 @@ def match_resources_with_no_java_source(project, logger=None, to_queryset=None):
15051515

15061516

15071517
def ignore_unmapped_resources_from_config(
1508-
project, patterns_to_ignore, logger=None, to_queryset=None
1518+
project, patterns_to_ignore, logger=None, to_queryset=None, **kwargs
15091519
):
15101520
"""Ignore unmapped resources for a project using `patterns_to_ignore`."""
15111521
if to_queryset is not None:
@@ -1526,7 +1536,7 @@ def ignore_unmapped_resources_from_config(
15261536

15271537

15281538
def match_unmapped_resources(
1529-
project, matched_extensions=None, logger=None, to_queryset=None
1539+
project, matched_extensions=None, logger=None, to_queryset=None, **kwargs
15301540
):
15311541
"""
15321542
Match resources with empty status to PurlDB, if unmatched
@@ -1636,7 +1646,7 @@ def flag_deployed_from_resources_with_missing_license(project, doc_extensions=No
16361646
unknown_license_files.update(status=flag.UNKNOWN_LICENSE)
16371647

16381648

1639-
def handle_dangling_deployed_legal_files(project, logger, to_queryset=None):
1649+
def handle_dangling_deployed_legal_files(project, logger, to_queryset=None, **kwargs):
16401650
"""
16411651
Scan the legal files with empty status and update status
16421652
to `REVIEW_DANGLING_LEGAL_FILE`.
@@ -1892,7 +1902,7 @@ def is_invalid_match(match, matched_path_length):
18921902
return matched_path_length == 1 and len(match.resource_ids) != 1
18931903

18941904

1895-
def map_elfs_with_dwarf_paths(project, logger=None, to_queryset=None):
1905+
def map_elfs_with_dwarf_paths(project, logger=None, to_queryset=None, **kwargs):
18961906
"""Map ELF binaries to their sources in ``project``."""
18971907
from_resources = project.codebaseresources.files().from_codebase()
18981908
if to_queryset is not None:
@@ -1964,7 +1974,7 @@ def get_go_file_paths(location):
19641974
return file_paths
19651975

19661976

1967-
def map_go_paths(project, logger=None, to_queryset=None):
1977+
def map_go_paths(project, logger=None, to_queryset=None, **kwargs):
19681978
"""Map Go binaries to their source in ``project``."""
19691979
from_resources = project.codebaseresources.files().from_codebase()
19701980
if to_queryset is not None:
@@ -2020,7 +2030,7 @@ def map_go_paths(project, logger=None, to_queryset=None):
20202030
WINPE_BINARY_OPTIONS = ["Windows"]
20212031

20222032

2023-
def extract_binary_symbols(project, options, logger=None, to_queryset=None):
2033+
def extract_binary_symbols(project, options, logger=None, to_queryset=None, **kwargs):
20242034
"""
20252035
Extract binary symbols for all Elf, Mach0 and Winpe binaries
20262036
found in the ``project`` resources, based on selected
@@ -2065,7 +2075,7 @@ def extract_binary_symbols(project, options, logger=None, to_queryset=None):
20652075
)
20662076

20672077

2068-
def map_rust_binaries_with_symbols(project, logger=None, to_queryset=None):
2078+
def map_rust_binaries_with_symbols(project, logger=None, to_queryset=None, **kwargs):
20692079
"""Map Rust binaries to their source using symbols in ``project``."""
20702080
from_resources = project.codebaseresources.files().from_codebase()
20712081
if to_queryset is not None:
@@ -2093,7 +2103,7 @@ def map_rust_binaries_with_symbols(project, logger=None, to_queryset=None):
20932103
)
20942104

20952105

2096-
def map_go_binaries_with_symbols(project, logger=None, to_queryset=None):
2106+
def map_go_binaries_with_symbols(project, logger=None, to_queryset=None, **kwargs):
20972107
"""Map Go binaries to their source using symbols in ``project``."""
20982108
from_resources = project.codebaseresources.files().from_codebase()
20992109
if to_queryset is not None:
@@ -2121,7 +2131,7 @@ def map_go_binaries_with_symbols(project, logger=None, to_queryset=None):
21212131
)
21222132

21232133

2124-
def map_elfs_binaries_with_symbols(project, logger=None, to_queryset=None):
2134+
def map_elfs_binaries_with_symbols(project, logger=None, to_queryset=None, **kwargs):
21252135
"""Map Elf binaries to their source using symbols in ``project``."""
21262136
from_resources = project.codebaseresources.files().from_codebase()
21272137
if to_queryset is not None:
@@ -2146,7 +2156,7 @@ def map_elfs_binaries_with_symbols(project, logger=None, to_queryset=None):
21462156
)
21472157

21482158

2149-
def map_macho_binaries_with_symbols(project, logger=None, to_queryset=None):
2159+
def map_macho_binaries_with_symbols(project, logger=None, to_queryset=None, **kwargs):
21502160
"""Map macho binaries to their source using symbols in ``project``."""
21512161
from_resources = project.codebaseresources.files().from_codebase()
21522162
if to_queryset is not None:
@@ -2174,7 +2184,7 @@ def map_macho_binaries_with_symbols(project, logger=None, to_queryset=None):
21742184
)
21752185

21762186

2177-
def map_winpe_binaries_with_symbols(project, logger=None, to_queryset=None):
2187+
def map_winpe_binaries_with_symbols(project, logger=None, to_queryset=None, **kwargs):
21782188
"""Map winpe binaries to their source using symbols in ``project``."""
21792189
from_resources = project.codebaseresources.files().from_codebase()
21802190
if to_queryset is not None:
@@ -2268,7 +2278,7 @@ def extract_binary_symbols_from_resources(resources, binary_symbols_func, logger
22682278
logger(f"Error parsing binary symbols at: {resource.location_path!r} {e!r}")
22692279

22702280

2271-
def map_javascript_symbols(project, logger=None, to_queryset=None):
2281+
def map_javascript_symbols(project, logger=None, to_queryset=None, **kwargs):
22722282
"""Map deployed JavaScript, TypeScript to its sources using symbols."""
22732283
project_files = project.codebaseresources.files()
22742284

@@ -2369,7 +2379,7 @@ def _map_javascript_symbols(to_resource, javascript_from_resources, logger):
23692379
return 0
23702380

23712381

2372-
def map_javascript_strings(project, logger=None, to_queryset=None):
2382+
def map_javascript_strings(project, logger=None, to_queryset=None, **kwargs):
23732383
"""Map deployed JavaScript, TypeScript to its sources using string literals."""
23742384
project_files = project.codebaseresources.files()
23752385

@@ -2457,7 +2467,7 @@ def _map_javascript_strings(to_resource, javascript_from_resources, logger):
24572467
return 0
24582468

24592469

2460-
def map_python_pyx_to_binaries(project, logger=None, to_queryset=None):
2470+
def map_python_pyx_to_binaries(project, logger=None, to_queryset=None, **kwargs):
24612471
"""Map Cython source to their compiled binaries in ``project``."""
24622472
from source_inspector.symbols_tree_sitter import get_tree_and_language_info
24632473

@@ -2505,7 +2515,7 @@ def map_python_pyx_to_binaries(project, logger=None, to_queryset=None):
25052515
)
25062516

25072517

2508-
def map_python_protobuf_files(project, logger=None, to_queryset=None):
2518+
def map_python_protobuf_files(project, logger=None, to_queryset=None, **kwargs):
25092519
"""Map protobuf-generated .py/.pyi files to their source .proto files."""
25102520
from_resources = (
25112521
project.codebaseresources.files().from_codebase().filter(extension=".proto")

0 commit comments

Comments
 (0)