Skip to content

Commit 5399fdd

Browse files
NucleonGodXNucleonGodX
committed
used NonAssemblableDatafileHandler
Signed-off-by: NucleonGodX <[email protected]>
1 parent d86ee1c commit 5399fdd

File tree

10 files changed

+49
-693
lines changed

10 files changed

+49
-693
lines changed

‎src/packagedcode/buildpack.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
from packageurl import PackageURL
44
import yaml
55

6-
class BuildpackHandler(models.DatafileHandler):
6+
class BuildpackHandler(models.NonAssemblableDatafileHandler):
77
"""
88
Handle buildpack.toml manifests.
99
See https://buildpacks.io/ for details on buildpack format.
1010
"""
1111
datasource_id = "buildpack_toml"
1212
path_patterns = ("*buildpack.toml",)
13-
default_package_type = "buildpack"
13+
default_package_type = "generic"
1414
description = "Cloud Native Buildpack manifest"
1515
documentation_url = "https://buildpacks.io/"
1616

@@ -38,7 +38,7 @@ def parse(cls, location, package_only=False):
3838
datasource_id=cls.datasource_id,
3939
type=cls.default_package_type,
4040
name=name,
41-
version=buildpack.get("version", "unknown"),
41+
version=buildpack.get("version"),
4242
description=buildpack.get("description"),
4343
homepage_url=buildpack.get("homepage"),
4444
keywords=buildpack.get("keywords", []),
@@ -67,7 +67,7 @@ def handle_paketo_buildpack(data, buildpack, package_data):
6767
package_data["extra_data"]["id"] = buildpack_id
6868

6969
package_data.update({
70-
"version": buildpack.get("version", "unknown"),
70+
"version": buildpack.get("version"),
7171
"description": buildpack.get("description"),
7272
"homepage_url": buildpack.get("homepage"),
7373
"keywords": buildpack.get("keywords", []),

‎tests/packagedcode/data/buildpack/heroku-buildpacks/heroku-buildpack-java/expectedbuildpack.json‎

Lines changed: 5 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,16 @@
11
{
2-
"packages": [
3-
{
4-
"type": "buildpack",
5-
"namespace": null,
6-
"name": "Java",
7-
"version": "unknown",
8-
"qualifiers": {},
9-
"subpath": null,
10-
"primary_language": null,
11-
"description": "Heroku buildpack for Java",
12-
"release_date": null,
13-
"parties": [],
14-
"keywords": [],
15-
"homepage_url": null,
16-
"download_url": null,
17-
"size": null,
18-
"sha1": null,
19-
"md5": null,
20-
"sha256": null,
21-
"sha512": null,
22-
"bug_tracking_url": null,
23-
"code_view_url": null,
24-
"vcs_url": null,
25-
"copyright": null,
26-
"holder": null,
27-
"declared_license_expression": null,
28-
"declared_license_expression_spdx": null,
29-
"license_detections": [],
30-
"other_license_expression": null,
31-
"other_license_expression_spdx": null,
32-
"other_license_detections": [],
33-
"extracted_license_statement": null,
34-
"notice_text": null,
35-
"source_packages": [],
36-
"is_private": false,
37-
"is_virtual": false,
38-
"extra_data": {
39-
"ignore_files": [
40-
"etc/",
41-
"spec/",
42-
"test/",
43-
".gitignore",
44-
".github/",
45-
"hatchet.json",
46-
"Gemfile",
47-
"Gemfile.lock"
48-
]
49-
},
50-
"repository_homepage_url": null,
51-
"repository_download_url": null,
52-
"api_data_url": null,
53-
"package_uid": "pkg:buildpack/Java@unknown?uuid=ca7d941a-dd59-4f95-a10c-a90b09f593fb",
54-
"datafile_paths": [
55-
"buildpack.toml"
56-
],
57-
"datasource_ids": [
58-
"buildpack_toml"
59-
],
60-
"purl": "pkg:buildpack/Java@unknown"
61-
}
62-
],
2+
"packages": [],
633
"dependencies": [],
644
"files": [
655
{
666
"path": "buildpack.toml",
677
"type": "file",
688
"package_data": [
699
{
70-
"type": "buildpack",
10+
"type": "generic",
7111
"namespace": null,
7212
"name": "Java",
73-
"version": "unknown",
13+
"version": null,
7414
"qualifiers": {},
7515
"subpath": null,
7616
"primary_language": null,
@@ -119,12 +59,10 @@
11959
"repository_download_url": null,
12060
"api_data_url": null,
12161
"datasource_id": "buildpack_toml",
122-
"purl": "pkg:buildpack/Java@unknown"
62+
"purl": "pkg:generic/Java"
12363
}
12464
],
125-
"for_packages": [
126-
"pkg:buildpack/Java@unknown?uuid=ca7d941a-dd59-4f95-a10c-a90b09f593fb"
127-
],
65+
"for_packages": [],
12866
"scan_errors": []
12967
}
13068
]

‎tests/packagedcode/data/buildpack/heroku-buildpacks/heroku-buildpack-php/expectedbuildpack.json‎

Lines changed: 5 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,16 @@
11
{
2-
"packages": [
3-
{
4-
"type": "buildpack",
5-
"namespace": null,
6-
"name": "PHP",
7-
"version": "unknown",
8-
"qualifiers": {},
9-
"subpath": null,
10-
"primary_language": null,
11-
"description": "Heroku buildpack for PHP",
12-
"release_date": null,
13-
"parties": [],
14-
"keywords": [],
15-
"homepage_url": null,
16-
"download_url": null,
17-
"size": null,
18-
"sha1": null,
19-
"md5": null,
20-
"sha256": null,
21-
"sha512": null,
22-
"bug_tracking_url": null,
23-
"code_view_url": null,
24-
"vcs_url": null,
25-
"copyright": null,
26-
"holder": null,
27-
"declared_license_expression": null,
28-
"declared_license_expression_spdx": null,
29-
"license_detections": [],
30-
"other_license_expression": null,
31-
"other_license_expression_spdx": null,
32-
"other_license_detections": [],
33-
"extracted_license_statement": null,
34-
"notice_text": null,
35-
"source_packages": [],
36-
"is_private": false,
37-
"is_virtual": false,
38-
"extra_data": {
39-
"ignore_files": [
40-
".github/",
41-
".gitignore",
42-
".rspec_parallel",
43-
"support/build/",
44-
"support/devcenter/",
45-
"test/",
46-
"Gemfile",
47-
"Gemfile.lock",
48-
"hatchet.json",
49-
"hatchet.lock",
50-
"requirements.txt"
51-
]
52-
},
53-
"repository_homepage_url": null,
54-
"repository_download_url": null,
55-
"api_data_url": null,
56-
"package_uid": "pkg:buildpack/PHP@unknown?uuid=e6f7b526-ad84-4897-b161-48a962b08a6f",
57-
"datafile_paths": [
58-
"buildpack.toml"
59-
],
60-
"datasource_ids": [
61-
"buildpack_toml"
62-
],
63-
"purl": "pkg:buildpack/PHP@unknown"
64-
}
65-
],
2+
"packages": [],
663
"dependencies": [],
674
"files": [
685
{
696
"path": "buildpack.toml",
707
"type": "file",
718
"package_data": [
729
{
73-
"type": "buildpack",
10+
"type": "generic",
7411
"namespace": null,
7512
"name": "PHP",
76-
"version": "unknown",
13+
"version": null,
7714
"qualifiers": {},
7815
"subpath": null,
7916
"primary_language": null,
@@ -125,12 +62,10 @@
12562
"repository_download_url": null,
12663
"api_data_url": null,
12764
"datasource_id": "buildpack_toml",
128-
"purl": "pkg:buildpack/PHP@unknown"
65+
"purl": "pkg:generic/PHP"
12966
}
13067
],
131-
"for_packages": [
132-
"pkg:buildpack/PHP@unknown?uuid=e6f7b526-ad84-4897-b161-48a962b08a6f"
133-
],
68+
"for_packages": [],
13469
"scan_errors": []
13570
}
13671
]

‎tests/packagedcode/data/buildpack/paketo-buildpacks/dotnet-execute/expectedbuildpack.json‎

Lines changed: 5 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,16 @@
11
{
2-
"packages": [
3-
{
4-
"type": "buildpack",
5-
"namespace": null,
6-
"name": "dotnet-execute",
7-
"version": "unknown",
8-
"qualifiers": {},
9-
"subpath": null,
10-
"primary_language": null,
11-
"description": "A buildpack for running the `dotnet execute` command for an app",
12-
"release_date": null,
13-
"parties": [],
14-
"keywords": [
15-
"dotnet"
16-
],
17-
"homepage_url": "https://github.com/paketo-buildpacks/dotnet-execute",
18-
"download_url": null,
19-
"size": null,
20-
"sha1": null,
21-
"md5": null,
22-
"sha256": null,
23-
"sha512": null,
24-
"bug_tracking_url": null,
25-
"code_view_url": null,
26-
"vcs_url": null,
27-
"copyright": null,
28-
"holder": null,
29-
"declared_license_expression": "apache-2.0",
30-
"declared_license_expression_spdx": "Apache-2.0",
31-
"license_detections": [
32-
{
33-
"license_expression": "apache-2.0",
34-
"license_expression_spdx": "Apache-2.0",
35-
"matches": [
36-
{
37-
"license_expression": "apache-2.0",
38-
"license_expression_spdx": "Apache-2.0",
39-
"from_file": "buildpack.toml",
40-
"start_line": 1,
41-
"end_line": 1,
42-
"matcher": "2-aho",
43-
"score": 100.0,
44-
"matched_length": 3,
45-
"match_coverage": 100.0,
46-
"rule_relevance": 100,
47-
"rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
48-
"rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE",
49-
"matched_text": "type: Apache-2.0"
50-
}
51-
],
52-
"identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8"
53-
}
54-
],
55-
"other_license_expression": null,
56-
"other_license_expression_spdx": null,
57-
"other_license_detections": [],
58-
"extracted_license_statement": "type: Apache-2.0",
59-
"notice_text": null,
60-
"source_packages": [],
61-
"is_private": false,
62-
"is_virtual": false,
63-
"extra_data": {
64-
"api_version": "0.8",
65-
"id": "paketo-buildpacks/dotnet-execute"
66-
},
67-
"repository_homepage_url": null,
68-
"repository_download_url": null,
69-
"api_data_url": null,
70-
"package_uid": "pkg:buildpack/dotnet-execute@unknown?uuid=ec4b26b3-1bad-482a-9d2a-b44cf87d1b8a",
71-
"datafile_paths": [
72-
"buildpack.toml"
73-
],
74-
"datasource_ids": [
75-
"buildpack_toml"
76-
],
77-
"purl": "pkg:buildpack/dotnet-execute@unknown"
78-
}
79-
],
2+
"packages": [],
803
"dependencies": [],
814
"files": [
825
{
836
"path": "buildpack.toml",
847
"type": "file",
858
"package_data": [
869
{
87-
"type": "buildpack",
10+
"type": "generic",
8811
"namespace": null,
8912
"name": "dotnet-execute",
90-
"version": "unknown",
13+
"version": null,
9114
"qualifiers": {},
9215
"subpath": null,
9316
"primary_language": null,
@@ -153,12 +76,10 @@
15376
"repository_download_url": null,
15477
"api_data_url": null,
15578
"datasource_id": "buildpack_toml",
156-
"purl": "pkg:buildpack/dotnet-execute@unknown"
79+
"purl": "pkg:generic/dotnet-execute"
15780
}
15881
],
159-
"for_packages": [
160-
"pkg:buildpack/dotnet-execute@unknown?uuid=ec4b26b3-1bad-482a-9d2a-b44cf87d1b8a"
161-
],
82+
"for_packages": [],
16283
"scan_errors": []
16384
}
16485
]

0 commit comments

Comments
 (0)