Skip to content
New issue

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

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

Already on GitHub? # to your account

Adjust catalogers to conform with work for license structure updates #1760

Merged
merged 24 commits into from
Apr 26, 2023

Conversation

wagoodman
Copy link
Contributor

This tags onto #1743 with additional changes to the catalogers (fixes and small adjustments).

Partially addresses #1577

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman added the WIP work in progress / do not merge label Apr 25, 2023
@github-actions
Copy link

github-actions bot commented Apr 25, 2023

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 8171M CPU @ 2.60GHz%0A                                                          │ ./.tmp/benchmark-439698a.txt │%0A                                                          │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                   14.91m ±  4%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                             1.214m ±  2%25%0AImagePackageCatalogers/python-package-cataloger-2                           4.192m ±  3%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                   1.063m ±  5%25%0AImagePackageCatalogers/javascript-package-cataloger-2                       549.7µ ±  3%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                   733.0µ ±  2%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                   710.6µ ±  2%25%0AImagePackageCatalogers/java-cataloger-2                                     16.46m ±  1%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                     114.3µ ± 15%25%0AImagePackageCatalogers/apkdb-cataloger-2                                    923.6µ ±  5%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                         115.5µ ±  2%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                              1.564m ±  3%25%0AImagePackageCatalogers/portage-cataloger-2                                  669.6µ ±  2%25%0AImagePackageCatalogers/nix-store-cataloger-2                                344.3µ ±  1%25%0AImagePackageCatalogers/sbom-cataloger-2                                     141.9µ ±  2%25%0AImagePackageCatalogers/binary-cataloger-2                                   253.8µ ±  1%25%0AImagePackageCatalogers/linux-kernel-cataloger-2                             65.62m ±  7%25%0Ageomean                                                                     1.084m%0A%0A                                                          │ ./.tmp/benchmark-439698a.txt │%0A                                                          │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                   5.080Mi ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                             164.5Ki ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                           1.006Mi ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                   217.4Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                       110.7Ki ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                   170.0Ki ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                   192.2Ki ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                     2.830Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                     8.750Ki ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                    202.1Ki ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                         10.06Ki ± 0%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                              409.9Ki ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                  159.9Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                48.91Ki ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                     14.20Ki ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                   31.95Ki ± 0%25%0AImagePackageCatalogers/linux-kernel-cataloger-2                             62.66Mi ± 0%25%0Ageomean                                                                     211.3Ki%0A%0A                                                          │ ./.tmp/benchmark-439698a.txt │%0A                                                          │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                    86.99k ± 0%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.606k ± 0%25%0AImagePackageCatalogers/python-package-cataloger-2                            16.58k ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                    4.316k ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                        1.483k ± 0%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                    2.989k ± 0%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                    4.167k ± 0%25%0AImagePackageCatalogers/java-cataloger-2                                      40.01k ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                       228.0 ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                     4.343k ± 0%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                           281.0 ± 0%25%0AImagePackageCatalogers/dotnet-deps-cataloger-2                               6.326k ± 0%25%0AImagePackageCatalogers/portage-cataloger-2                                   2.699k ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                  884.0 ± 0%25%0AImagePackageCatalogers/sbom-cataloger-2                                       394.0 ± 0%25%0AImagePackageCatalogers/binary-cataloger-2                                     896.0 ± 0%25%0AImagePackageCatalogers/linux-kernel-cataloger-2                              2.969k ± 0%25%0Ageomean                                                                      2.846k

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman added the changelog-ignore Don't include this issue in the release changelog label Apr 25, 2023
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
…icense-revamp-catalogers-alex

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman marked this pull request as ready for review April 26, 2023 13:23
@wagoodman wagoodman removed the WIP work in progress / do not merge label Apr 26, 2023
@wagoodman wagoodman requested a review from spiffcs April 26, 2023 13:23
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman merged commit 8242205 into 1577-license-revamp Apr 26, 2023
@wagoodman wagoodman deleted the 1577-license-revamp-catalogers-alex branch April 26, 2023 14:09
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
changelog-ignore Don't include this issue in the release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant