Skip to content

Update deb to new generic cataloger pattern#1288

Merged
wagoodman merged 1 commit intomainfrom
update-deb-generic-cataloger
Oct 25, 2022
Merged

Update deb to new generic cataloger pattern#1288
wagoodman merged 1 commit intomainfrom
update-deb-generic-cataloger

Conversation

@wagoodman
Copy link
Copy Markdown
Contributor

Follow up to #1281 , porting the DEB cataloger to the new generic.Cataloger.

This PR also makes the following adjustments:

  • updates the new internal/pkgtest helper with a builder pattern approach (the DEB cataloger needs these extra use cases and a multi-constructor based approach would become untenable here)
  • With the last point, to test catalogers without introducing a package cycle, moving the cataloger.Cataloger interface to pkg.Cataloger was necessary. This is additionally consistent with the plan in Top-level API should be more composable #558 .

@wagoodman wagoodman requested a review from a team October 25, 2022 14:26
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Oct 25, 2022

Benchmark Test Results

Benchmark results from the latest changes vs base branch
name                                                       time/op
ImagePackageCatalogers/alpmdb-cataloger-2                  14.7ms ± 1%
ImagePackageCatalogers/ruby-gemspec-cataloger-2            1.76ms ± 9%
ImagePackageCatalogers/python-package-cataloger-2          4.28ms ± 2%
ImagePackageCatalogers/php-composer-installed-cataloger-2  1.38ms ± 3%
ImagePackageCatalogers/javascript-package-cataloger-2       971µs ± 1%
ImagePackageCatalogers/dpkgdb-cataloger-2                  1.15ms ± 1%
ImagePackageCatalogers/rpm-db-cataloger-2                  1.66ms ± 2%
ImagePackageCatalogers/java-cataloger-2                    18.4ms ± 2%
ImagePackageCatalogers/apkdb-cataloger-2                   1.60ms ± 2%
ImagePackageCatalogers/go-module-binary-cataloger-2        2.88µs ± 3%
ImagePackageCatalogers/dotnet-deps-cataloger-2             1.81ms ± 1%
ImagePackageCatalogers/portage-cataloger-2                  924µs ± 1%

name                                                       alloc/op
ImagePackageCatalogers/alpmdb-cataloger-2                  5.26MB ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2             202kB ± 0%
ImagePackageCatalogers/python-package-cataloger-2           945kB ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2   213kB ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2       158kB ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                   199kB ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                   301kB ± 0%
ImagePackageCatalogers/java-cataloger-2                    3.44MB ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                   1.25MB ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2          672B ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2              376kB ± 0%
ImagePackageCatalogers/portage-cataloger-2                  136kB ± 0%

name                                                       allocs/op
ImagePackageCatalogers/alpmdb-cataloger-2                   85.7k ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2             4.23k ± 0%
ImagePackageCatalogers/python-package-cataloger-2           16.5k ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2   5.50k ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2       3.31k ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                   4.50k ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                   8.11k ± 0%
ImagePackageCatalogers/java-cataloger-2                     57.5k ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                    5.39k ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2          15.0 ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2              7.32k ± 0%
ImagePackageCatalogers/portage-cataloger-2                  3.58k ± 0%

Copy link
Copy Markdown
Contributor

@kzantow kzantow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this includes #1287?

@wagoodman
Copy link
Copy Markdown
Contributor Author

re: 1287. yeah, I'm starting to chain PRs... I need to rebase this one so it won't include it

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman force-pushed the update-deb-generic-cataloger branch from b39bd71 to 0f73ff8 Compare October 25, 2022 15:21
@wagoodman wagoodman enabled auto-merge (squash) October 25, 2022 15:23
@wagoodman wagoodman merged commit 52cb726 into main Oct 25, 2022
@wagoodman wagoodman deleted the update-deb-generic-cataloger branch October 25, 2022 15:47
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
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.

2 participants