Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: read direct package files when decoding SPDX tag-value #2014

Merged
merged 2 commits into from
Aug 14, 2023
Merged

fix: read direct package files when decoding SPDX tag-value #2014

merged 2 commits into from
Aug 14, 2023

Conversation

kzantow
Copy link
Contributor

@kzantow kzantow commented Aug 10, 2023

This PR corrects an issue that when decoding SPDX tag-value direct package files are omitted.

Fixes #2013

@github-actions
Copy link

github-actions bot commented Aug 10, 2023 •
edited
Loading

Benchmark Test Results

Benchmark results from the latest changes vs base branch 
goos: linux%0Agoarch: amd64%0Apkg: github.com/anchore/syft/test/integration%0Acpu: Intel(R) Xeon(R) Platinum 8272CL CPU @ 2.60GHz%0A                                                              │ ./.tmp/benchmark-a0f71a5.txt │%0A                                                              │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                        12.66m ± 2%25%0AImagePackageCatalogers/apkdb-cataloger-2                                         723.2µ ± 1%25%0AImagePackageCatalogers/binary-cataloger-2                                        203.6µ ± 1%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                        609.2µ ± 1%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                    21.22µ ± 2%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                              96.15µ ± 3%25%0AImagePackageCatalogers/java-cataloger-2                                          13.50m ± 1%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                          93.96µ ± 2%25%0AImagePackageCatalogers/javascript-package-cataloger-2                            379.4µ ± 2%25%0AImagePackageCatalogers/nix-store-cataloger-2                                     283.0µ ± 8%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                        816.6µ ± 2%25%0AImagePackageCatalogers/portage-cataloger-2                                       478.2µ ± 1%25%0AImagePackageCatalogers/python-package-cataloger-2                                3.305m ± 1%25%0AImagePackageCatalogers/r-package-cataloger-2                                     210.1µ ± 3%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                        562.6µ ± 2%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                  944.3µ ± 2%25%0AImagePackageCatalogers/sbom-cataloger-2                                          121.2µ ± 2%25%0Ageomean                                                                          490.5µ%0A%0A                                                              │ ./.tmp/benchmark-a0f71a5.txt │%0A                                                              │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       5.141Mi ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                        205.3Ki ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                       30.49Ki ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                       172.8Ki ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                   3.696Ki ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                             9.906Ki ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                         2.824Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         8.594Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           94.22Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    49.33Ki ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       186.7Ki ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                      120.2Ki ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                               1.004Mi ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                    53.29Ki ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                       181.3Ki ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                 144.1Ki ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                         14.20Ki ± 0%25%0Ageomean                                                                         100.5Ki%0A%0A                                                              │ ./.tmp/benchmark-a0f71a5.txt │%0A                                                              │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                        88.14k ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                         4.190k ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                         848.0 ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                        3.145k ± 0%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                     132.0 ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                               281.0 ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                          40.63k ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                           228.0 ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                            1.342k ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                      898.0 ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                        4.079k ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                       2.272k ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                                16.44k ± 0%25%0AImagePackageCatalogers/r-package-cataloger-2                                      929.0 ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                        3.992k ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                  2.447k ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                           394.0 ± 0%25%0Ageomean                                                                          2.063k

@kzantow
chore: lint-fix
87f9afa 
Signed-off-by: Keith Zantow <[email protected]>
@spiffcs spiffcs merged commit b3d7ba5 into main Aug 14, 2023
9 checks passed
@spiffcs spiffcs deleted the fix/read-spdx-package-files branch August 14, 2023 15:37
This was referenced Aug 18, 2023
Open
Closed
Closed
Closed
This was referenced Aug 28, 2023
Closed
Closed
Closed
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
@kzantow
fix: read direct package files when decoding SPDX tag-value (anchore#…
aef881b 
…2014)

* fix: read direct package files when decoding SPDX tag-value

---------

Signed-off-by: Keith Zantow <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spiffcs spiffcs spiffcs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

SPDX Tag-Value conversion not handling files directly set on packages
2 participants
@kzantow @spiffcs