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.

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

fix: merging of binary packages #1583

Merged
merged 9 commits into from
Feb 22, 2023
Merged

fix: merging of binary packages #1583

merged 9 commits into from
Feb 22, 2023

Conversation

kzantow
Copy link
Contributor

@kzantow kzantow commented Feb 17, 2023

This PR corrects an issue where packages from different binary classifiers were not being merged together correctly.

Fixes: #1579

Signed-off-by: Keith Zantow <kzantow@gmail.com>
@github-actions
Copy link

github-actions bot commented Feb 17, 2023

Benchmark Test Results

Benchmark results from the latest changes vs base branch
goos: linux
goarch: amd64
pkg: github.com/anchore/syft/test/integration
cpu: Intel(R) Xeon(R) Platinum 8272CL CPU @ 2.60GHz
                                                          │ ./.tmp/benchmark-8a19ba3.txt │
                                                          │            sec/op            │
ImagePackageCatalogers/alpmdb-cataloger-2                                   10.33m ±  2%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             778.0µ ± 13%
ImagePackageCatalogers/python-package-cataloger-2                           2.664m ±  1%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   605.0µ ±  1%
ImagePackageCatalogers/javascript-package-cataloger-2                       322.1µ ±  1%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   444.6µ ±  1%
ImagePackageCatalogers/rpm-db-cataloger-2                                   431.3µ ±  2%
ImagePackageCatalogers/java-cataloger-2                                     9.348m ±  1%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     7.024µ ±  4%
ImagePackageCatalogers/apkdb-cataloger-2                                    443.2µ ±  1%
ImagePackageCatalogers/go-module-binary-cataloger-2                         15.74µ ±  3%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              872.7µ ±  2%
ImagePackageCatalogers/portage-cataloger-2                                  277.3µ ±  1%
ImagePackageCatalogers/sbom-cataloger-2                                     92.10µ ±  2%
ImagePackageCatalogers/binary-cataloger-2                                   120.6µ ±  1%
geomean                                                                     397.7µ

                                                          │ ./.tmp/benchmark-8a19ba3.txt │
                                                          │             B/op             │
ImagePackageCatalogers/alpmdb-cataloger-2                                   5.061Mi ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             141.7Ki ± 0%
ImagePackageCatalogers/python-package-cataloger-2                           946.6Ki ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   156.0Ki ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                       95.70Ki ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   144.7Ki ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                   170.4Ki ± 0%
ImagePackageCatalogers/java-cataloger-2                                     2.721Mi ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     1.523Ki ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                    123.1Ki ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                         3.102Ki ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              314.0Ki ± 0%
ImagePackageCatalogers/portage-cataloger-2                                  75.41Ki ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                     13.05Ki ± 0%
ImagePackageCatalogers/binary-cataloger-2                                   20.54Ki ± 0%
geomean                                                                     106.7Ki

                                                          │ ./.tmp/benchmark-8a19ba3.txt │
                                                          │          allocs/op           │
ImagePackageCatalogers/alpmdb-cataloger-2                                    86.71k ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.159k ± 0%
ImagePackageCatalogers/python-package-cataloger-2                            15.49k ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                    3.458k ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                        1.253k ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                    2.646k ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                    3.759k ± 0%
ImagePackageCatalogers/java-cataloger-2                                      38.26k ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                       40.00 ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                     3.252k ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                           101.0 ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                               5.010k ± 0%
ImagePackageCatalogers/portage-cataloger-2                                   1.487k ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                       392.0 ± 0%
ImagePackageCatalogers/binary-cataloger-2                                     609.0 ± 0%
geomean                                                                      2.170k

Signed-off-by: Keith Zantow <kzantow@gmail.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
Signed-off-by: Keith Zantow <kzantow@gmail.com>
@kzantow kzantow merged commit f5e2052 into main Feb 22, 2023
@kzantow kzantow deleted the fix/merging-binary-packages branch February 22, 2023 17:03
noqcks pushed a commit to noqcks/syft that referenced this pull request Feb 23, 2023
noqcks added a commit to noqcks/syft that referenced this pull request Feb 23, 2023
Signed-off-by: Benji Visser <benji@093b.org>

chore: update SPDX license list (anchore#1599)

Update SPDX license list to 3.20 (anchore#1600)

Signed-off-by: Marc-Etienne Vargenau <marc-etienne.vargenau@nokia.com>

Update Stereoscope to 529924d6d5aa6c708cceffc651883b6e1e27f5df (anchore#1602)

Signed-off-by: GitHub <noreply@github.com>

feat: add perl binary classifier (anchore#1592)

Signed-off-by: Benji Visser <benji@093b.org>

chore: update syft bootstrap tools to latest versions. (anchore#1593)

fix: issue when matching format versions (anchore#1585)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

fix: merging of binary packages (anchore#1583)

chore: fix cataloger_test (anchore#1603)

Signed-off-by: Keith Zantow <kzantow@gmail.com>

Update Stereoscope to fab1c9638abc2c21cd53dca1f205f37d71148ee0 (anchore#1604)

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: wagoodman <wagoodman@users.noreply.github.com>

Revert "add workaround for macos github actions cache issue (anchore#1584)" (anchore#1605)

This reverts commit 0076b19.

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

remove schema 6.2.1

Signed-off-by: Benji Visser <benji@093b.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Python binary detected multiple times when only installed once
3 participants