From e5a085bcb5ee86d369ffca2ee3dcc8069cd95bc7 Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Wed, 29 Jan 2025 21:45:58 +0530 Subject: [PATCH 1/2] changing toolname to ScanCode.io Signed-off-by: Avan2021 --- .../data/asgiref/asgiref-3.3.0_load_inventory_expected.json | 2 +- scanpipe/tests/data/asgiref/asgiref-3.3.0_scanpipe_output.json | 2 +- scanpipe/tests/data/d2d/about_files/expected.json | 2 +- scanpipe/tests/data/d2d/flume-ng-node-d2d-input.json | 2 +- scanpipe/tests/data/d2d/flume-ng-node-d2d.json | 2 +- .../data/dependencies/resolved_dependencies_cocoapods.json | 2 +- .../resolved_dependencies_npm_inspect_packages.json | 2 +- .../tests/data/dependencies/resolved_dependencies_nuget.json | 2 +- scanpipe/tests/data/dependencies/resolved_dependencies_pip.json | 2 +- .../resolved_dependencies_poetry_inspect_packages.json | 2 +- .../resolved_dependencies_swift_inspect_packages.json | 2 +- scanpipe/tests/data/docker/alpine_3_15_4_scan_codebase.json | 2 +- scanpipe/tests/data/docker/centos_scan_codebase.json | 2 +- scanpipe/tests/data/docker/debian_scan_codebase.json | 2 +- .../tests/data/docker/gcr_io_distroless_base_scan_codebase.json | 2 +- .../data/image-with-symlinks/minitag.tar-expected-scan.json | 2 +- scanpipe/tests/data/matchcode/match_to_matchcode/codebase.json | 2 +- scanpipe/tests/data/rootfs/basic-rootfs_root_filesystems.json | 2 +- .../scancode/daglib-0.6.0-py3-none-any.whl_scan_codebase.json | 2 +- scanpipe/tests/data/scancode/is-npm-1.0.0_scan_codebase.json | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/scanpipe/tests/data/asgiref/asgiref-3.3.0_load_inventory_expected.json b/scanpipe/tests/data/asgiref/asgiref-3.3.0_load_inventory_expected.json index c6cff1ba8..8c8413cf8 100644 --- a/scanpipe/tests/data/asgiref/asgiref-3.3.0_load_inventory_expected.json +++ b/scanpipe/tests/data/asgiref/asgiref-3.3.0_load_inventory_expected.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/asgiref/asgiref-3.3.0_scanpipe_output.json b/scanpipe/tests/data/asgiref/asgiref-3.3.0_scanpipe_output.json index 3fbc82f35..2b7621d01 100644 --- a/scanpipe/tests/data/asgiref/asgiref-3.3.0_scanpipe_output.json +++ b/scanpipe/tests/data/asgiref/asgiref-3.3.0_scanpipe_output.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "tool_version": "v34.8.2-2-gdde1fc5b", "other_tools": [ "pkg:pypi/scancode-toolkit@v34.8.2-2-gdde1fc5b" diff --git a/scanpipe/tests/data/d2d/about_files/expected.json b/scanpipe/tests/data/d2d/about_files/expected.json index 71bd269f7..ee8bf016d 100644 --- a/scanpipe/tests/data/d2d/about_files/expected.json +++ b/scanpipe/tests/data/d2d/about_files/expected.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/d2d/flume-ng-node-d2d-input.json b/scanpipe/tests/data/d2d/flume-ng-node-d2d-input.json index 4a206e9d3..8d1a8ebaf 100644 --- a/scanpipe/tests/data/d2d/flume-ng-node-d2d-input.json +++ b/scanpipe/tests/data/d2d/flume-ng-node-d2d-input.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [], "runs": [ diff --git a/scanpipe/tests/data/d2d/flume-ng-node-d2d.json b/scanpipe/tests/data/d2d/flume-ng-node-d2d.json index cac80687d..2e439c692 100644 --- a/scanpipe/tests/data/d2d/flume-ng-node-d2d.json +++ b/scanpipe/tests/data/d2d/flume-ng-node-d2d.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/dependencies/resolved_dependencies_cocoapods.json b/scanpipe/tests/data/dependencies/resolved_dependencies_cocoapods.json index 57c53794d..ed558f244 100644 --- a/scanpipe/tests/data/dependencies/resolved_dependencies_cocoapods.json +++ b/scanpipe/tests/data/dependencies/resolved_dependencies_cocoapods.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/dependencies/resolved_dependencies_npm_inspect_packages.json b/scanpipe/tests/data/dependencies/resolved_dependencies_npm_inspect_packages.json index 02d314fb5..721bae9d7 100644 --- a/scanpipe/tests/data/dependencies/resolved_dependencies_npm_inspect_packages.json +++ b/scanpipe/tests/data/dependencies/resolved_dependencies_npm_inspect_packages.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/dependencies/resolved_dependencies_nuget.json b/scanpipe/tests/data/dependencies/resolved_dependencies_nuget.json index 69ae8621d..a20b2655a 100644 --- a/scanpipe/tests/data/dependencies/resolved_dependencies_nuget.json +++ b/scanpipe/tests/data/dependencies/resolved_dependencies_nuget.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/dependencies/resolved_dependencies_pip.json b/scanpipe/tests/data/dependencies/resolved_dependencies_pip.json index 5f7dd15ef..5cd6e0b12 100644 --- a/scanpipe/tests/data/dependencies/resolved_dependencies_pip.json +++ b/scanpipe/tests/data/dependencies/resolved_dependencies_pip.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/dependencies/resolved_dependencies_poetry_inspect_packages.json b/scanpipe/tests/data/dependencies/resolved_dependencies_poetry_inspect_packages.json index aeda3db1d..e96e55916 100644 --- a/scanpipe/tests/data/dependencies/resolved_dependencies_poetry_inspect_packages.json +++ b/scanpipe/tests/data/dependencies/resolved_dependencies_poetry_inspect_packages.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/dependencies/resolved_dependencies_swift_inspect_packages.json b/scanpipe/tests/data/dependencies/resolved_dependencies_swift_inspect_packages.json index f45ddbf73..32cb01369 100644 --- a/scanpipe/tests/data/dependencies/resolved_dependencies_swift_inspect_packages.json +++ b/scanpipe/tests/data/dependencies/resolved_dependencies_swift_inspect_packages.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/docker/alpine_3_15_4_scan_codebase.json b/scanpipe/tests/data/docker/alpine_3_15_4_scan_codebase.json index 6a47adf3d..d83f4e737 100644 --- a/scanpipe/tests/data/docker/alpine_3_15_4_scan_codebase.json +++ b/scanpipe/tests/data/docker/alpine_3_15_4_scan_codebase.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/docker/centos_scan_codebase.json b/scanpipe/tests/data/docker/centos_scan_codebase.json index e72198bca..cc0ae631e 100644 --- a/scanpipe/tests/data/docker/centos_scan_codebase.json +++ b/scanpipe/tests/data/docker/centos_scan_codebase.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/docker/debian_scan_codebase.json b/scanpipe/tests/data/docker/debian_scan_codebase.json index 52bf7e72c..875d66f65 100644 --- a/scanpipe/tests/data/docker/debian_scan_codebase.json +++ b/scanpipe/tests/data/docker/debian_scan_codebase.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/docker/gcr_io_distroless_base_scan_codebase.json b/scanpipe/tests/data/docker/gcr_io_distroless_base_scan_codebase.json index 29c099762..aa1adf8bf 100644 --- a/scanpipe/tests/data/docker/gcr_io_distroless_base_scan_codebase.json +++ b/scanpipe/tests/data/docker/gcr_io_distroless_base_scan_codebase.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/image-with-symlinks/minitag.tar-expected-scan.json b/scanpipe/tests/data/image-with-symlinks/minitag.tar-expected-scan.json index d1f635844..1ce008152 100644 --- a/scanpipe/tests/data/image-with-symlinks/minitag.tar-expected-scan.json +++ b/scanpipe/tests/data/image-with-symlinks/minitag.tar-expected-scan.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/matchcode/match_to_matchcode/codebase.json b/scanpipe/tests/data/matchcode/match_to_matchcode/codebase.json index 279fa3819..a2c3e38a9 100644 --- a/scanpipe/tests/data/matchcode/match_to_matchcode/codebase.json +++ b/scanpipe/tests/data/matchcode/match_to_matchcode/codebase.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "tool_version": "v3.0.0-241-g45d653b", "other_tools": [ "pkg:pypi/scancode-toolkit@32.0.8" diff --git a/scanpipe/tests/data/rootfs/basic-rootfs_root_filesystems.json b/scanpipe/tests/data/rootfs/basic-rootfs_root_filesystems.json index aade28c99..977b6eb8d 100644 --- a/scanpipe/tests/data/rootfs/basic-rootfs_root_filesystems.json +++ b/scanpipe/tests/data/rootfs/basic-rootfs_root_filesystems.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/scancode/daglib-0.6.0-py3-none-any.whl_scan_codebase.json b/scanpipe/tests/data/scancode/daglib-0.6.0-py3-none-any.whl_scan_codebase.json index 223d18de9..c63048f45 100644 --- a/scanpipe/tests/data/scancode/daglib-0.6.0-py3-none-any.whl_scan_codebase.json +++ b/scanpipe/tests/data/scancode/daglib-0.6.0-py3-none-any.whl_scan_codebase.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { diff --git a/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_codebase.json b/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_codebase.json index a4dd341da..80d0fd6c6 100644 --- a/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_codebase.json +++ b/scanpipe/tests/data/scancode/is-npm-1.0.0_scan_codebase.json @@ -1,7 +1,7 @@ { "headers": [ { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "notice": "Generated with ScanCode.io and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied.\nNo content created from ScanCode.io should be considered or used as legal advice.\nConsult an Attorney for any legal advice.\nScanCode.io is a free software code scanning tool from nexB Inc. and others\nlicensed under the Apache License version 2.0.\nScanCode is a trademark of nexB Inc.\nVisit https://github.com/nexB/scancode.io for support and download.\n", "input_sources": [ { From a306d08f18cc12605ab02336056d7b7f972f25bd Mon Sep 17 00:00:00 2001 From: Avan2021 Date: Thu, 27 Feb 2025 09:54:36 +0530 Subject: [PATCH 2/2] Setting tool_name to ScanCode.io for output Signed-off-by: Avan2021 --- scanpipe/pipes/output.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scanpipe/pipes/output.py b/scanpipe/pipes/output.py index f73ebf4c9..e5d88f096 100644 --- a/scanpipe/pipes/output.py +++ b/scanpipe/pipes/output.py @@ -232,7 +232,7 @@ def get_headers(self, project): other_tools = [f"pkg:pypi/scancode-toolkit@{scancode_toolkit_version}"] headers = { - "tool_name": "scanpipe", + "tool_name": "ScanCode.io", "tool_version": scancodeio_version, "other_tools": other_tools, "notice": SCAN_NOTICE,