From b69f20e368fbb1f825ce36efaa264854702ceaa8 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Mon, 29 Jul 2024 17:22:18 +0530 Subject: [PATCH] Update package assembly to consider other manifests Previously we used to yeild resources for the entire subtree after we find a package manifest, and ingore and skip creating package and dependencies from other manifests present there. The package assembly process is updated to only yeild and ignore package manifest resources used already to create package/dependencies. Reference: https://github.com/nexB/scancode-toolkit/issues/3604 Signed-off-by: Ayan Sinha Mahapatra --- src/packagedcode/about.py | 11 +- src/packagedcode/cargo.py | 9 +- src/packagedcode/chef.py | 5 +- src/packagedcode/cocoapods.py | 7 +- src/packagedcode/golang.py | 5 +- src/packagedcode/maven.py | 2 +- src/packagedcode/models.py | 14 +- src/packagedcode/npm.py | 5 +- src/packagedcode/phpcomposer.py | 6 +- src/packagedcode/plugin_package.py | 10 +- src/packagedcode/rubygems.py | 14 +- .../cargo-with-workspace/tauri.expected.json | 464 ++++++++++++- .../data/cargo/scan.expected.json | 618 +++++++++--------- .../pnpm/pnpm-lock/v5/cobe-scan.expected.json | 24 +- .../pnpm-lock/v6/tabler-scan.expected.json | 59 +- .../data/plugin/chef-package-expected.json | 24 +- 16 files changed, 884 insertions(+), 393 deletions(-) diff --git a/src/packagedcode/about.py b/src/packagedcode/about.py index 5a1192fdd28..2f7dfda5e1b 100644 --- a/src/packagedcode/about.py +++ b/src/packagedcode/about.py @@ -79,9 +79,11 @@ def parse(cls, location, package_only=False): declared_license_expression = package_data.get('license_expression') owner = package_data.get('owner') - if not isinstance(owner, str): - owner = repr(owner) - parties = [models.Party(type=models.party_person, name=owner, role='owner')] + parties = None + if owner: + if not isinstance(owner, str): + owner = repr(owner) + parties = [models.Party(type=models.party_person, name=owner, role='owner')] # FIXME: also include notice_file and license_file(s) as file_references file_references = [] @@ -157,7 +159,8 @@ def assemble(cls, package_data, resource, codebase, package_adder): missing = sorted(file_references_by_path.values(), key=lambda r: r.path) package.extra_data['missing_file_references'] = missing else: - package.extra_data['missing_file_references'] = package_data.file_references[:] + if package.file_references: + package.extra_data['missing_file_references'] = package_data.file_references[:] # we yield this as we do not want this further processed yield resource diff --git a/src/packagedcode/cargo.py b/src/packagedcode/cargo.py index 198ef1c7440..148028d496a 100644 --- a/src/packagedcode/cargo.py +++ b/src/packagedcode/cargo.py @@ -39,6 +39,7 @@ def logger_debug(*args): class CargoBaseHandler(models.DatafileHandler): + @classmethod def assemble(cls, package_data, resource, codebase, package_adder): """ @@ -46,6 +47,10 @@ def assemble(cls, package_data, resource, codebase, package_adder): support cargo workspaces where we have multiple packages from a repository and some shared information present at top-level. """ + datafile_name_patterns = ( + CargoLockHandler.path_patterns + CargoTomlHandler.path_patterns + ) + workspace = package_data.extra_data.get('workspace', {}) workspace_members = workspace.get("members", []) workspace_package_data = workspace.get("package", {}) @@ -89,14 +94,14 @@ def assemble(cls, package_data, resource, codebase, package_adder): resource.save(codebase) yield from cls.assemble_from_many_datafiles( - datafile_name_patterns=('Cargo.toml', 'cargo.toml', 'Cargo.lock', 'cargo.lock'), + datafile_name_patterns=datafile_name_patterns, directory=workspace_directory, codebase=codebase, package_adder=package_adder, ) else: yield from cls.assemble_from_many_datafiles( - datafile_name_patterns=('Cargo.toml', 'cargo.toml', 'Cargo.lock', 'cargo.lock'), + datafile_name_patterns=datafile_name_patterns, directory=resource.parent(codebase), codebase=codebase, package_adder=package_adder, diff --git a/src/packagedcode/chef.py b/src/packagedcode/chef.py index d5df6a2f6c4..632ab5392d8 100644 --- a/src/packagedcode/chef.py +++ b/src/packagedcode/chef.py @@ -146,8 +146,11 @@ def assemble(cls, package_data, resource, codebase, package_adder): """ Assemble Package from Chef metadata.rb, then from metadata.json files. """ + datafile_name_patterns = ( + ChefMetadataRbHandler.path_patterns + ChefMetadataJsonHandler.path_patterns + ) yield from cls.assemble_from_many_datafiles( - datafile_name_patterns=('metadata.rb', 'metadata.json',), + datafile_name_patterns=datafile_name_patterns, directory=resource.parent(codebase), codebase=codebase, package_adder=package_adder, diff --git a/src/packagedcode/cocoapods.py b/src/packagedcode/cocoapods.py index 4a86dccc8d0..d8f3684ab41 100644 --- a/src/packagedcode/cocoapods.py +++ b/src/packagedcode/cocoapods.py @@ -13,6 +13,7 @@ import logging import sys from functools import partial +from fnmatch import fnmatchcase import saneyaml from packageurl import PackageURL @@ -142,9 +143,10 @@ def assemble(cls, package_data, resource, codebase, package_adder): else: # do we have more than one podspec? parent = resource.parent(codebase) + podspec_path_pattern = PodspecHandler.path_patterns[0] sibling_podspecs = [ r for r in parent.children(codebase) - if r.name.endswith('.podspec') + if fnmatchcase(r.name, podspec_path_pattern) ] siblings_counts = len(sibling_podspecs) @@ -152,8 +154,7 @@ def assemble(cls, package_data, resource, codebase, package_adder): has_multiple_podspec = siblings_counts > 1 datafile_name_patterns = ( - 'Podfile.lock', - 'Podfile', + PodfileHandler.path_patterns + PodfileLockHandler.path_patterns ) if has_single_podspec: diff --git a/src/packagedcode/golang.py b/src/packagedcode/golang.py index 68651fa6cb1..e367e6d1ef0 100644 --- a/src/packagedcode/golang.py +++ b/src/packagedcode/golang.py @@ -32,8 +32,11 @@ def assemble(cls, package_data, resource, codebase, package_adder): """ Always use go.mod first then go.sum """ + datafile_name_patterns = ( + GoModHandler.path_patterns + GoSumHandler.path_patterns + ) yield from cls.assemble_from_many_datafiles( - datafile_name_patterns=('go.mod', 'go.sum',), + datafile_name_patterns=datafile_name_patterns, directory=resource.parent(codebase), codebase=codebase, package_adder=package_adder, diff --git a/src/packagedcode/maven.py b/src/packagedcode/maven.py index 1498add8cf0..33245ab3465 100644 --- a/src/packagedcode/maven.py +++ b/src/packagedcode/maven.py @@ -72,7 +72,7 @@ def assemble(cls, package_data, resource, codebase, package_adder=models.add_to_ # This order is important as we want pom.xml to be used for package # creation and then to update from MANIFEST later - manifest_path_pattern = '*/META-INF/MANIFEST.MF' + manifest_path_pattern = JavaJarManifestHandler.path_patterns[0] nested_pom_xml_path_pattern = '*/META-INF/maven/**/pom.xml' datafile_name_patterns = (nested_pom_xml_path_pattern, manifest_path_pattern) diff --git a/src/packagedcode/models.py b/src/packagedcode/models.py index 26c6b6d0c8c..c5cd966e56d 100644 --- a/src/packagedcode/models.py +++ b/src/packagedcode/models.py @@ -1279,7 +1279,7 @@ def assemble_from_many( else: # FIXME: What is the package_data is NOT for the same package as package? # FIXME: What if the update did not do anything? (it does return True or False) - # FIXME: There we would be missing out packges AND/OR errors + # FIXME: There we would be missing out packages AND/OR errors package.update( package_data=package_data, datafile_path=resource.path, @@ -1309,7 +1309,7 @@ def assemble_from_many( yield package yield from dependencies - # Associate Package to Resources and yield them + # Associate Package to the manifest resources and yield them for resource in resources: package_adder(package_uid, resource, codebase) yield resource @@ -1318,11 +1318,12 @@ def assemble_from_many( package_adder(package_uid, resource, codebase) yield resource - # the whole parent subtree of the base_resource is for this package + # the whole parent subtree of the base_resource is for this package, + # so assign resources to package if package_uid: for res in base_resource.walk(codebase): package_adder(package_uid, res, codebase) - yield res + if parent_resource: package_adder(package_uid, parent_resource, codebase) yield parent_resource @@ -1368,7 +1369,10 @@ def assemble_from_many_datafiles( # we iterate on datafile_name_patterns because their order matters for datafile_name_pattern in datafile_name_patterns: for sibling in siblings: - if fnmatchcase(sibling.name, datafile_name_pattern): + if ( + fnmatchcase(sibling.name, datafile_name_pattern) or + fnmatchcase(sibling.location, datafile_name_pattern) + ): for package_data in sibling.package_data: package_data = PackageData.from_dict(package_data) pkgdata_resources.append((package_data, sibling,)) diff --git a/src/packagedcode/npm.py b/src/packagedcode/npm.py index 4f7c1f3aa31..39b020dc4f7 100644 --- a/src/packagedcode/npm.py +++ b/src/packagedcode/npm.py @@ -161,7 +161,7 @@ def assemble(cls, package_data, resource, codebase, package_adder): for npm_res in cls.walk_npm(resource=workspace_root, codebase=codebase): if package_uid and package_uid not in npm_res.for_packages: package_adder(package_uid, npm_res, codebase) - yield npm_res + yield package_resource elif workspaces: @@ -190,7 +190,7 @@ def assemble(cls, package_data, resource, codebase, package_adder): for npm_res in cls.walk_npm(resource=workspace_root, codebase=codebase): if package_uid and not npm_res.for_packages: package_adder(package_uid, npm_res, codebase) - yield npm_res + yield package_resource else: @@ -257,7 +257,6 @@ def create_packages_from_workspaces( for npm_res in cls.walk_npm(resource=member_root, codebase=codebase): if package_uid and package_uid not in npm_res.for_packages: package_adder(package_uid, npm_res, codebase) - yield npm_res yield from cls.yield_npm_dependencies_and_resources( package_resource=workspace_member, diff --git a/src/packagedcode/phpcomposer.py b/src/packagedcode/phpcomposer.py index f7ca2bd0079..54e25ba0341 100644 --- a/src/packagedcode/phpcomposer.py +++ b/src/packagedcode/phpcomposer.py @@ -26,10 +26,8 @@ class BasePhpComposerHandler(models.DatafileHandler): @classmethod def assemble(cls, package_data, resource, codebase, package_adder): - datafile_name_patterns = ( - 'composer.json', - 'composer.lock', - ) + datafile_name_patterns = \ + PhpComposerJsonHandler.path_patterns + PhpComposerLockHandler.path_patterns if resource.has_parent(): dir_resource = resource.parent(codebase) diff --git a/src/packagedcode/plugin_package.py b/src/packagedcode/plugin_package.py index b1487022c40..5fa26e49781 100644 --- a/src/packagedcode/plugin_package.py +++ b/src/packagedcode/plugin_package.py @@ -376,7 +376,7 @@ def get_package_and_deps(codebase, package_adder=add_to_package, strip_root=Fals packages = [] dependencies = [] - seen_resource_paths = set() + seen_package_manifest_paths = set() has_single_resource = codebase.has_single_resource # track resource ids that have been already processed @@ -384,7 +384,7 @@ def get_package_and_deps(codebase, package_adder=add_to_package, strip_root=Fals if not resource.package_data: continue - if resource.path in seen_resource_paths: + if resource.path in seen_package_manifest_paths: continue if TRACE_ASSEMBLY: @@ -430,12 +430,12 @@ def get_package_and_deps(codebase, package_adder=add_to_package, strip_root=Fals dependencies.append(item) elif isinstance(item, Resource): - seen_resource_paths.add(item.path) + seen_package_manifest_paths.add(item.path) if TRACE_ASSEMBLY: logger_debug( - ' get_package_and_deps: seen_resource_path:', - seen_resource_paths, + ' get_package_and_deps: seen_package_manifest_paths:', + seen_package_manifest_paths, ) else: diff --git a/src/packagedcode/rubygems.py b/src/packagedcode/rubygems.py index 704005c0d21..4a2fee0443a 100644 --- a/src/packagedcode/rubygems.py +++ b/src/packagedcode/rubygems.py @@ -56,11 +56,9 @@ def assemble_extracted_gem(cls, package_data, resource, codebase, package_adder) An assemble implementation shared by handlers for manifests found in an extracted gem using extractcode. """ - datafile_name_patterns = ( - 'metadata.gz-extract/metadata.gz-extract', - 'data.gz-extract/*.gemspec', - 'data.gz-extract/Gemfile', - 'data.gz-extract/Gemfile.lock', + datafile_name_patterns = ('metadata.gz-extract/metadata.gz-extract',) + ( + GemspecHandler.path_patterns + GemfileHandler.path_patterns + + GemfileLockHandler.path_patterns ) gemroot = get_ancestor(levels_up=2, resource=resource, codebase=codebase) @@ -105,11 +103,9 @@ class BaseGemProjectHandler(models.DatafileHandler): @classmethod def assemble(cls, package_data, resource, codebase, package_adder): datafile_name_patterns = ( - '*.gemspec', - 'Gemfile', - 'Gemfile.lock', + GemspecHandler.path_patterns + GemfileHandler.path_patterns + + GemfileLockHandler.path_patterns ) - yield from cls.assemble_from_many_datafiles( datafile_name_patterns=datafile_name_patterns, directory=resource.parent(codebase), diff --git a/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json b/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json index 391dc044a9f..6f5a79d1694 100644 --- a/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json +++ b/tests/packagedcode/data/cargo/cargo-with-workspace/tauri.expected.json @@ -414,6 +414,128 @@ "npm_package_json" ], "purl": "pkg:npm/tauri-workspace@0.0.0" + }, + { + "type": "npm", + "namespace": null, + "name": "api", + "version": "1.0.0", + "qualifiers": {}, + "subpath": null, + "primary_language": "JavaScript", + "description": null, + "release_date": null, + "parties": [], + "keywords": [], + "homepage_url": null, + "download_url": "https://registry.npmjs.org/api/-/api-1.0.0.tgz", + "size": null, + "sha1": null, + "md5": null, + "sha256": null, + "sha512": null, + "bug_tracking_url": null, + "code_view_url": null, + "vcs_url": null, + "copyright": null, + "holder": null, + "declared_license_expression": null, + "declared_license_expression_spdx": null, + "license_detections": [], + "other_license_expression": null, + "other_license_expression_spdx": null, + "other_license_detections": [], + "extracted_license_statement": null, + "notice_text": null, + "source_packages": [], + "is_private": true, + "is_virtual": false, + "extra_data": {}, + "repository_homepage_url": null, + "repository_download_url": null, + "api_data_url": null, + "package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_paths": [ + "tauri/examples/api/package.json" + ], + "datasource_ids": [ + "npm_package_json" + ], + "purl": "pkg:npm/api@1.0.0" + }, + { + "type": "cargo", + "namespace": null, + "name": "api", + "version": "0.1.0", + "qualifiers": {}, + "subpath": null, + "primary_language": "Rust", + "description": "An example Tauri Application showcasing the api", + "release_date": null, + "parties": [], + "keywords": [], + "homepage_url": null, + "download_url": null, + "size": null, + "sha1": null, + "md5": null, + "sha256": null, + "sha512": null, + "bug_tracking_url": null, + "code_view_url": null, + "vcs_url": null, + "copyright": null, + "holder": null, + "declared_license_expression": "apache-2.0 OR mit", + "declared_license_expression_spdx": "Apache-2.0 OR MIT", + "license_detections": [ + { + "license_expression": "apache-2.0 OR mit", + "license_expression_spdx": "Apache-2.0 OR MIT", + "matches": [ + { + "license_expression": "apache-2.0 OR mit", + "spdx_license_expression": "Apache-2.0 OR MIT", + "from_file": "tauri/examples/api/src-tauri/Cargo.toml", + "start_line": 1, + "end_line": 1, + "matcher": "1-hash", + "score": 100.0, + "matched_length": 5, + "match_coverage": 100.0, + "rule_relevance": 100, + "rule_identifier": "apache-2.0_or_mit_36.RULE", + "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_or_mit_36.RULE", + "matched_text": "Apache-2.0 OR MIT" + } + ], + "identifier": "apache_2_0_or_mit-70d858d7-8968-9e7f-b90f-18b72fb96bef" + } + ], + "other_license_expression": null, + "other_license_expression_spdx": null, + "other_license_detections": [], + "extracted_license_statement": "Apache-2.0 OR MIT", + "notice_text": null, + "source_packages": [], + "is_private": false, + "is_virtual": false, + "extra_data": { + "rust_version": "1.70", + "rust_edition": "2021" + }, + "repository_homepage_url": "https://crates.io/crates/api", + "repository_download_url": "https://crates.io/api/v1/crates/api/0.1.0/download", + "api_data_url": "https://crates.io/api/v1/crates/api", + "package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_paths": [ + "tauri/examples/api/src-tauri/Cargo.toml" + ], + "datasource_ids": [ + "cargo_toml" + ], + "purl": "pkg:cargo/api@0.1.0" } ], "dependencies": [ @@ -1543,6 +1665,334 @@ "for_package_uid": "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_path": "tauri/package.json", "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/%40tauri-apps/api", + "extracted_requirement": "../../tooling/api/dist", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/%40tauri-apps/api?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/%40zerodevx/svelte-json-view", + "extracted_requirement": "0.2.1", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/%40zerodevx/svelte-json-view?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/%40iconify-json/codicon", + "extracted_requirement": "^1.1.10", + "scope": "devDependencies", + "is_runtime": false, + "is_optional": true, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/%40iconify-json/codicon?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/%40iconify-json/ph", + "extracted_requirement": "^1.1.1", + "scope": "devDependencies", + "is_runtime": false, + "is_optional": true, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/%40iconify-json/ph?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/internal-ip", + "extracted_requirement": "^7.0.0", + "scope": "devDependencies", + "is_runtime": false, + "is_optional": true, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/internal-ip?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/unocss", + "extracted_requirement": "^0.39.3", + "scope": "devDependencies", + "is_runtime": false, + "is_optional": true, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/unocss?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/%40sveltejs/vite-plugin-svelte", + "extracted_requirement": "^2.4.6", + "scope": "devDependencies", + "is_runtime": false, + "is_optional": true, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/%40sveltejs/vite-plugin-svelte?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/svelte", + "extracted_requirement": "^4.2.1", + "scope": "devDependencies", + "is_runtime": false, + "is_optional": true, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/svelte?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:npm/vite", + "extracted_requirement": "^4.4.9", + "scope": "devDependencies", + "is_runtime": false, + "is_optional": true, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:npm/vite?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/package.json", + "datasource_id": "npm_package_json" + }, + { + "purl": "pkg:cargo/addr2line@0.21.0", + "extracted_requirement": "0.21.0", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": true, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:cargo/addr2line@0.21.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "tauri/examples/api/src-tauri/Cargo.lock", + "datasource_id": "cargo_lock" + }, + { + "purl": "pkg:cargo/adler@1.0.2", + "extracted_requirement": "1.0.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": true, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:cargo/adler@1.0.2?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "tauri/examples/api/src-tauri/Cargo.lock", + "datasource_id": "cargo_lock" + }, + { + "purl": "pkg:cargo/aead@0.5.2", + "extracted_requirement": "0.5.2", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": true, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:cargo/aead@0.5.2?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "tauri/examples/api/src-tauri/Cargo.lock", + "datasource_id": "cargo_lock" + }, + { + "purl": "pkg:cargo/tauri-build", + "extracted_requirement": null, + "scope": "build-dependencies", + "is_runtime": false, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "path": "../../../core/tauri-build", + "features": [ + "codegen", + "isolation" + ] + }, + "dependency_uid": "pkg:cargo/tauri-build?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/serde_json", + "extracted_requirement": "1.0", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:cargo/serde_json?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/serde", + "extracted_requirement": "1.0", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "version": "1.0", + "features": [ + "derive" + ] + }, + "dependency_uid": "pkg:cargo/serde?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/tiny_http", + "extracted_requirement": "0.11", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:cargo/tiny_http?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/log", + "extracted_requirement": "0.4", + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": {}, + "dependency_uid": "pkg:cargo/log?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/tauri-plugin-sample", + "extracted_requirement": null, + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "path": "./tauri-plugin-sample/" + }, + "dependency_uid": "pkg:cargo/tauri-plugin-sample?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/tauri", + "extracted_requirement": null, + "scope": "dependencies", + "is_runtime": true, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "path": "../../../core/tauri", + "features": [ + "protocol-asset", + "icon-ico", + "icon-png", + "isolation", + "macos-private-api", + "tray-icon" + ] + }, + "dependency_uid": "pkg:cargo/tauri?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" + }, + { + "purl": "pkg:cargo/tauri", + "extracted_requirement": null, + "scope": "dev-dependencies", + "is_runtime": false, + "is_optional": false, + "is_resolved": false, + "is_direct": true, + "resolved_package": {}, + "extra_data": { + "path": "../../../core/tauri", + "features": [ + "test" + ] + }, + "dependency_uid": "pkg:cargo/tauri?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_path": "tauri/examples/api/src-tauri/Cargo.toml", + "datasource_id": "cargo_toml" } ], "files": [ @@ -3005,7 +3455,8 @@ } ], "for_packages": [ - "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -3014,7 +3465,8 @@ "type": "directory", "package_data": [], "for_packages": [ - "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -3102,7 +3554,9 @@ } ], "for_packages": [ - "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, @@ -3299,7 +3753,9 @@ } ], "for_packages": [ - "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758" + "pkg:npm/tauri-workspace@0.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "pkg:npm/api@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "pkg:cargo/api@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] }, diff --git a/tests/packagedcode/data/cargo/scan.expected.json b/tests/packagedcode/data/cargo/scan.expected.json index bd2cac64789..3536f916877 100644 --- a/tests/packagedcode/data/cargo/scan.expected.json +++ b/tests/packagedcode/data/cargo/scan.expected.json @@ -191,658 +191,658 @@ ], "dependencies": [ { - "purl": "pkg:cargo/base64", - "extracted_requirement": "0.13", + "purl": "pkg:cargo/ahash@0.7.4", + "extracted_requirement": "0.7.4", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/base64?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/ahash@0.7.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/bcder", - "extracted_requirement": "0.6", + "purl": "pkg:cargo/autocfg@1.0.1", + "extracted_requirement": "1.0.1", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/bcder?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/autocfg@1.0.1?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/bzip2", - "extracted_requirement": "0.4", + "purl": "pkg:cargo/cfg-if@0.1.10", + "extracted_requirement": "0.1.10", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/bzip2?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/cfg-if@0.1.10?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/chrono", - "extracted_requirement": "0.4", + "purl": "pkg:cargo/cfg-if@1.0.0", + "extracted_requirement": "1.0.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, - "extra_data": { - "version": "0.4", - "features": [ - "serde" - ] - }, - "dependency_uid": "pkg:cargo/chrono?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "extra_data": {}, + "dependency_uid": "pkg:cargo/cfg-if@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/digest", - "extracted_requirement": "0.10", + "purl": "pkg:cargo/chrono@0.4.19", + "extracted_requirement": "0.4.19", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/digest?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/chrono@0.4.19?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/log", - "extracted_requirement": "0.4", + "purl": "pkg:cargo/getrandom@0.2.3", + "extracted_requirement": "0.2.3", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/log?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/getrandom@0.2.3?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/md-5", - "extracted_requirement": "0.10", + "purl": "pkg:cargo/hashbrown@0.11.2", + "extracted_requirement": "0.11.2", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/md-5?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/hashbrown@0.11.2?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/flate2", - "extracted_requirement": "1.0", + "purl": "pkg:cargo/libc@0.2.97", + "extracted_requirement": "0.2.97", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/flate2?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/libc@0.2.97?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/rand", - "extracted_requirement": "0.8", + "purl": "pkg:cargo/log@0.4.14", + "extracted_requirement": "0.4.14", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/rand?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/log@0.4.14?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/reqwest", - "extracted_requirement": "0.11", + "purl": "pkg:cargo/memory_units@0.4.0", + "extracted_requirement": "0.4.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, - "extra_data": { - "version": "0.11", - "default-features": false - }, - "dependency_uid": "pkg:cargo/reqwest?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "extra_data": {}, + "dependency_uid": "pkg:cargo/memory_units@0.4.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/scroll", - "extracted_requirement": "0.11", + "purl": "pkg:cargo/num-integer@0.1.44", + "extracted_requirement": "0.1.44", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, - "extra_data": { - "version": "0.11", - "features": [ - "derive" - ] - }, - "dependency_uid": "pkg:cargo/scroll?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "extra_data": {}, + "dependency_uid": "pkg:cargo/num-integer@0.1.44?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/serde-xml-rs", - "extracted_requirement": "0.5", + "purl": "pkg:cargo/num-traits@0.2.14", + "extracted_requirement": "0.2.14", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/serde-xml-rs?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/num-traits@0.2.14?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/serde", - "extracted_requirement": "1.0", + "purl": "pkg:cargo/once_cell@1.8.0", + "extracted_requirement": "1.8.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, - "extra_data": { - "version": "1.0", - "features": [ - "derive" - ] - }, - "dependency_uid": "pkg:cargo/serde?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "extra_data": {}, + "dependency_uid": "pkg:cargo/once_cell@1.8.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/sha1", - "extracted_requirement": "0.10", + "purl": "pkg:cargo/proxy-wasm@0.1.4", + "extracted_requirement": "0.1.4", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/sha1?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/proxy-wasm@0.1.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/sha2", - "extracted_requirement": "0.10", + "purl": "pkg:cargo/time@0.1.43", + "extracted_requirement": "0.1.43", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/sha2?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/time@0.1.43?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/thiserror", - "extracted_requirement": "1.0", + "purl": "pkg:cargo/version_check@0.9.3", + "extracted_requirement": "0.9.3", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/thiserror?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/version_check@0.9.3?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/url", - "extracted_requirement": "2.2", + "purl": "pkg:cargo/wasi@0.10.2%2Bwasi-snapshot-preview1", + "extracted_requirement": "0.10.2+wasi-snapshot-preview1", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/url?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/wasi@0.10.2%2Bwasi-snapshot-preview1?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/xml-rs", - "extracted_requirement": "0.8", + "purl": "pkg:cargo/wee_alloc@0.4.5", + "extracted_requirement": "0.4.5", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/xml-rs?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/wee_alloc@0.4.5?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/xz2", - "extracted_requirement": "0.1", + "purl": "pkg:cargo/winapi@0.3.9", + "extracted_requirement": "0.3.9", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/xz2?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "dependency_uid": "pkg:cargo/winapi@0.3.9?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/cryptographic-message-syntax", - "extracted_requirement": "0.15.0-pre", + "purl": "pkg:cargo/winapi-i686-pc-windows-gnu@0.4.0", + "extracted_requirement": "0.4.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, - "extra_data": { - "path": "../cryptographic-message-syntax", - "version": "0.15.0-pre" - }, - "dependency_uid": "pkg:cargo/cryptographic-message-syntax?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "extra_data": {}, + "dependency_uid": "pkg:cargo/winapi-i686-pc-windows-gnu@0.4.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/x509-certificate", - "extracted_requirement": "0.13.0-pre", + "purl": "pkg:cargo/winapi-x86_64-pc-windows-gnu@0.4.0", + "extracted_requirement": "0.4.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": false, + "is_resolved": true, "is_direct": true, "resolved_package": {}, - "extra_data": { - "path": "../x509-certificate", - "version": "0.13.0-pre" - }, - "dependency_uid": "pkg:cargo/x509-certificate?uuid=fixed-uid-done-for-testing-5642512d1758", - "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.toml", - "datasource_id": "cargo_toml" + "extra_data": {}, + "dependency_uid": "pkg:cargo/winapi-x86_64-pc-windows-gnu@0.4.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "for_package_uid": null, + "datafile_path": "scan/Cargo.lock", + "datasource_id": "cargo_lock" }, { - "purl": "pkg:cargo/ahash@0.7.4", - "extracted_requirement": "0.7.4", + "purl": "pkg:cargo/base64", + "extracted_requirement": "0.13", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/ahash@0.7.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/base64?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/autocfg@1.0.1", - "extracted_requirement": "1.0.1", + "purl": "pkg:cargo/bcder", + "extracted_requirement": "0.6", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/autocfg@1.0.1?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/bcder?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/cfg-if@0.1.10", - "extracted_requirement": "0.1.10", + "purl": "pkg:cargo/bzip2", + "extracted_requirement": "0.4", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/cfg-if@0.1.10?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/bzip2?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/cfg-if@1.0.0", - "extracted_requirement": "1.0.0", + "purl": "pkg:cargo/chrono", + "extracted_requirement": "0.4", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, - "extra_data": {}, - "dependency_uid": "pkg:cargo/cfg-if@1.0.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "extra_data": { + "version": "0.4", + "features": [ + "serde" + ] + }, + "dependency_uid": "pkg:cargo/chrono?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/chrono@0.4.19", - "extracted_requirement": "0.4.19", + "purl": "pkg:cargo/digest", + "extracted_requirement": "0.10", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/chrono@0.4.19?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/digest?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/getrandom@0.2.3", - "extracted_requirement": "0.2.3", + "purl": "pkg:cargo/log", + "extracted_requirement": "0.4", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/getrandom@0.2.3?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/log?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/hashbrown@0.11.2", - "extracted_requirement": "0.11.2", + "purl": "pkg:cargo/md-5", + "extracted_requirement": "0.10", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/hashbrown@0.11.2?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/md-5?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/libc@0.2.97", - "extracted_requirement": "0.2.97", + "purl": "pkg:cargo/flate2", + "extracted_requirement": "1.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/libc@0.2.97?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/flate2?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/log@0.4.14", - "extracted_requirement": "0.4.14", + "purl": "pkg:cargo/rand", + "extracted_requirement": "0.8", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/log@0.4.14?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/rand?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/memory_units@0.4.0", - "extracted_requirement": "0.4.0", + "purl": "pkg:cargo/reqwest", + "extracted_requirement": "0.11", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, - "extra_data": {}, - "dependency_uid": "pkg:cargo/memory_units@0.4.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "extra_data": { + "version": "0.11", + "default-features": false + }, + "dependency_uid": "pkg:cargo/reqwest?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/num-integer@0.1.44", - "extracted_requirement": "0.1.44", + "purl": "pkg:cargo/scroll", + "extracted_requirement": "0.11", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, - "extra_data": {}, - "dependency_uid": "pkg:cargo/num-integer@0.1.44?uuid=fixed-uid-done-for-testing-5642512d1758", + "extra_data": { + "version": "0.11", + "features": [ + "derive" + ] + }, + "dependency_uid": "pkg:cargo/scroll?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/num-traits@0.2.14", - "extracted_requirement": "0.2.14", + "purl": "pkg:cargo/serde-xml-rs", + "extracted_requirement": "0.5", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/num-traits@0.2.14?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/serde-xml-rs?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/once_cell@1.8.0", - "extracted_requirement": "1.8.0", + "purl": "pkg:cargo/serde", + "extracted_requirement": "1.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, - "extra_data": {}, - "dependency_uid": "pkg:cargo/once_cell@1.8.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "extra_data": { + "version": "1.0", + "features": [ + "derive" + ] + }, + "dependency_uid": "pkg:cargo/serde?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/proxy-wasm@0.1.4", - "extracted_requirement": "0.1.4", + "purl": "pkg:cargo/sha1", + "extracted_requirement": "0.10", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/proxy-wasm@0.1.4?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/sha1?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/time@0.1.43", - "extracted_requirement": "0.1.43", + "purl": "pkg:cargo/sha2", + "extracted_requirement": "0.10", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/time@0.1.43?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/sha2?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/version_check@0.9.3", - "extracted_requirement": "0.9.3", + "purl": "pkg:cargo/thiserror", + "extracted_requirement": "1.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/version_check@0.9.3?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/thiserror?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/wasi@0.10.2%2Bwasi-snapshot-preview1", - "extracted_requirement": "0.10.2+wasi-snapshot-preview1", + "purl": "pkg:cargo/url", + "extracted_requirement": "2.2", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/wasi@0.10.2%2Bwasi-snapshot-preview1?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/url?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/wee_alloc@0.4.5", - "extracted_requirement": "0.4.5", + "purl": "pkg:cargo/xml-rs", + "extracted_requirement": "0.8", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/wee_alloc@0.4.5?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/xml-rs?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/winapi@0.3.9", - "extracted_requirement": "0.3.9", + "purl": "pkg:cargo/xz2", + "extracted_requirement": "0.1", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, "extra_data": {}, - "dependency_uid": "pkg:cargo/winapi@0.3.9?uuid=fixed-uid-done-for-testing-5642512d1758", + "dependency_uid": "pkg:cargo/xz2?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/winapi-i686-pc-windows-gnu@0.4.0", - "extracted_requirement": "0.4.0", + "purl": "pkg:cargo/cryptographic-message-syntax", + "extracted_requirement": "0.15.0-pre", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, - "extra_data": {}, - "dependency_uid": "pkg:cargo/winapi-i686-pc-windows-gnu@0.4.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "extra_data": { + "path": "../cryptographic-message-syntax", + "version": "0.15.0-pre" + }, + "dependency_uid": "pkg:cargo/cryptographic-message-syntax?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" }, { - "purl": "pkg:cargo/winapi-x86_64-pc-windows-gnu@0.4.0", - "extracted_requirement": "0.4.0", + "purl": "pkg:cargo/x509-certificate", + "extracted_requirement": "0.13.0-pre", "scope": "dependencies", "is_runtime": true, "is_optional": false, - "is_resolved": true, + "is_resolved": false, "is_direct": true, "resolved_package": {}, - "extra_data": {}, - "dependency_uid": "pkg:cargo/winapi-x86_64-pc-windows-gnu@0.4.0?uuid=fixed-uid-done-for-testing-5642512d1758", + "extra_data": { + "path": "../x509-certificate", + "version": "0.13.0-pre" + }, + "dependency_uid": "pkg:cargo/x509-certificate?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:cargo/apple-xar@0.4.0-pre?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "scan/Cargo.lock", - "datasource_id": "cargo_lock" + "datafile_path": "scan/Cargo.toml", + "datasource_id": "cargo_toml" } ], "files": [ diff --git a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json index 6be2cf0ebc2..fe7ac0481a9 100644 --- a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json +++ b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json @@ -10,15 +10,7 @@ "primary_language": null, "description": null, "release_date": null, - "parties": [ - { - "type": "person", - "role": "owner", - "name": "None", - "email": null, - "url": null - } - ], + "parties": [], "keywords": [], "homepage_url": "https://cobe.vercel.app/", "download_url": "https://github.com/shuding/cobe/releases/tag/0.6.3", @@ -43,9 +35,7 @@ "source_packages": [], "is_private": false, "is_virtual": false, - "extra_data": { - "missing_file_references": [] - }, + "extra_data": {}, "repository_homepage_url": null, "repository_download_url": null, "api_data_url": null, @@ -2215,15 +2205,7 @@ "primary_language": null, "description": null, "release_date": null, - "parties": [ - { - "type": "person", - "role": "owner", - "name": "None", - "email": null, - "url": null - } - ], + "parties": null, "keywords": [], "homepage_url": "https://cobe.vercel.app/", "download_url": "https://github.com/shuding/cobe/releases/tag/0.6.3", diff --git a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json index 5495b7e41ef..d589ae7c2eb 100644 --- a/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json +++ b/tests/packagedcode/data/npm/pnpm/pnpm-lock/v6/tabler-scan.expected.json @@ -90,6 +90,54 @@ "npm_package_json" ], "purl": "pkg:npm/%40tabler/core@1.0.0-beta20" + }, + { + "type": "npm", + "namespace": "@tabler", + "name": "core", + "version": "1.0.0-beta20", + "qualifiers": {}, + "subpath": null, + "primary_language": null, + "description": null, + "release_date": null, + "parties": [], + "keywords": [], + "homepage_url": "https://github.com/tabler/tabler/", + "download_url": "https://github.com/tabler/tabler/releases/tag/v1.0.0-beta20", + "size": null, + "sha1": null, + "md5": null, + "sha256": null, + "sha512": null, + "bug_tracking_url": null, + "code_view_url": null, + "vcs_url": null, + "copyright": null, + "holder": null, + "declared_license_expression": null, + "declared_license_expression_spdx": null, + "license_detections": [], + "other_license_expression": null, + "other_license_expression_spdx": null, + "other_license_detections": [], + "extracted_license_statement": null, + "notice_text": null, + "source_packages": [], + "is_private": false, + "is_virtual": false, + "extra_data": {}, + "repository_homepage_url": null, + "repository_download_url": null, + "api_data_url": null, + "package_uid": "pkg:npm/%40tabler/core@1.0.0-beta20?uuid=fixed-uid-done-for-testing-5642512d1758", + "datafile_paths": [ + "tabler/tabler.ABOUT" + ], + "datasource_ids": [ + "about_file" + ], + "purl": "pkg:npm/%40tabler/core@1.0.0-beta20" } ], "dependencies": [ @@ -6965,15 +7013,7 @@ "primary_language": null, "description": null, "release_date": null, - "parties": [ - { - "type": "person", - "role": "owner", - "name": "None", - "email": null, - "url": null - } - ], + "parties": null, "keywords": [], "homepage_url": "https://github.com/tabler/tabler/", "download_url": "https://github.com/tabler/tabler/releases/tag/v1.0.0-beta20", @@ -7009,6 +7049,7 @@ } ], "for_packages": [ + "pkg:npm/%40tabler/core@1.0.0-beta20?uuid=fixed-uid-done-for-testing-5642512d1758", "pkg:npm/%40tabler/core@1.0.0-beta20?uuid=fixed-uid-done-for-testing-5642512d1758" ], "scan_errors": [] diff --git a/tests/packagedcode/data/plugin/chef-package-expected.json b/tests/packagedcode/data/plugin/chef-package-expected.json index a55cb8f9abf..d5098f468a1 100644 --- a/tests/packagedcode/data/plugin/chef-package-expected.json +++ b/tests/packagedcode/data/plugin/chef-package-expected.json @@ -42,7 +42,7 @@ { "license_expression": "mit", "spdx_license_expression": "MIT", - "from_file": "package/metadata.rb", + "from_file": "package/metadata.json", "start_line": 1, "end_line": 1, "matcher": "1-spdx-id", @@ -64,7 +64,7 @@ { "license_expression": "mit", "spdx_license_expression": "MIT", - "from_file": "package/metadata.json", + "from_file": "package/metadata.rb", "start_line": 1, "end_line": 1, "matcher": "1-spdx-id", @@ -94,12 +94,12 @@ "api_data_url": "https://supermarket.chef.io/api/v1/cookbooks/301/versions/0.1.0", "package_uid": "pkg:chef/301@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", "datafile_paths": [ - "metadata.rb", - "metadata.json" + "metadata.json", + "metadata.rb" ], "datasource_ids": [ - "chef_cookbook_metadata_rb", - "chef_cookbook_metadata_json" + "chef_cookbook_metadata_json", + "chef_cookbook_metadata_rb" ], "purl": "pkg:chef/301@0.1.0" } @@ -107,7 +107,7 @@ "dependencies": [ { "purl": "pkg:chef/nodejs", - "extracted_requirement": null, + "extracted_requirement": ">= 0.0.0", "scope": "dependencies", "is_runtime": true, "is_optional": false, @@ -117,12 +117,12 @@ "extra_data": {}, "dependency_uid": "pkg:chef/nodejs?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:chef/301@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "metadata.rb", - "datasource_id": "chef_cookbook_metadata_rb" + "datafile_path": "metadata.json", + "datasource_id": "chef_cookbook_metadata_json" }, { "purl": "pkg:chef/nodejs", - "extracted_requirement": ">= 0.0.0", + "extracted_requirement": null, "scope": "dependencies", "is_runtime": true, "is_optional": false, @@ -132,8 +132,8 @@ "extra_data": {}, "dependency_uid": "pkg:chef/nodejs?uuid=fixed-uid-done-for-testing-5642512d1758", "for_package_uid": "pkg:chef/301@0.1.0?uuid=fixed-uid-done-for-testing-5642512d1758", - "datafile_path": "metadata.json", - "datasource_id": "chef_cookbook_metadata_json" + "datafile_path": "metadata.rb", + "datasource_id": "chef_cookbook_metadata_rb" } ], "files": [