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: update glob to use newer usr/lib/sysimage path #1997

Merged
merged 1 commit into from
Aug 3, 2023

Conversation

spiffcs
Copy link
Contributor

@spiffcs spiffcs commented Aug 3, 2023

Summary

See the below link:
https://fedoraproject.org/wiki/Changes/RelocateRPMToUsr

Photon does not soft link the old location of var/lib to the newer location like other distros. We should account for this in our RpmDBGlob search by including a search for the newer path

Fix ScreenShot

Note the second run of syft is the latest version. The first run has the current branches code
Screenshot 2023-08-03 at 7 08 14 PM

https://fedoraproject.org/wiki/Changes/RelocateRPMToUsr

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
@github-actions
Copy link

github-actions bot commented Aug 3, 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 8272CL CPU @ 2.60GHz%0A                                                              │ ./.tmp/benchmark-0b3d5dc.txt │%0A                                                              │            sec/op            │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       12.31m ±  2%25%0AImagePackageCatalogers/apkdb-cataloger-2                                        705.5µ ±  1%25%0AImagePackageCatalogers/binary-cataloger-2                                       203.5µ ±  1%25%0AImagePackageCatalogers/dpkgdb-cataloger-2                                       619.9µ ±  8%25%0AImagePackageCatalogers/dotnet-portable-executable-cataloger-2                   21.07µ ±  1%25%0AImagePackageCatalogers/go-module-binary-cataloger-2                             92.44µ ±  1%25%0AImagePackageCatalogers/java-cataloger-2                                         13.29m ±  2%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         91.27µ ±  1%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           374.3µ ± 22%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    275.5µ ±  2%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       781.7µ ±  1%25%0AImagePackageCatalogers/portage-cataloger-2                                      473.1µ ±  2%25%0AImagePackageCatalogers/python-package-cataloger-2                               3.279m ±  1%25%0AImagePackageCatalogers/r-package-cataloger-2                                    200.5µ ±  3%25%0AImagePackageCatalogers/rpm-db-cataloger-2                                       545.5µ ±  2%25%0AImagePackageCatalogers/ruby-gemspec-cataloger-2                                 926.4µ ±  1%25%0AImagePackageCatalogers/sbom-cataloger-2                                         119.2µ ±  1%25%0Ageomean                                                                         480.7µ%0A%0A                                                              │ ./.tmp/benchmark-0b3d5dc.txt │%0A                                                              │             B/op             │%0AImagePackageCatalogers/alpmdb-cataloger-2                                       5.145Mi ± 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.846Mi ± 0%25%0AImagePackageCatalogers/graalvm-native-image-cataloger-2                         8.594Ki ± 0%25%0AImagePackageCatalogers/javascript-package-cataloger-2                           94.21Ki ± 0%25%0AImagePackageCatalogers/nix-store-cataloger-2                                    49.32Ki ± 0%25%0AImagePackageCatalogers/php-composer-installed-cataloger-2                       186.5Ki ± 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.6Ki%0A%0A                                                              │ ./.tmp/benchmark-0b3d5dc.txt │%0A                                                              │          allocs/op           │%0AImagePackageCatalogers/alpmdb-cataloger-2                                        88.14k ± 0%25%0AImagePackageCatalogers/apkdb-cataloger-2                                         4.189k ± 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.20k ± 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.062k

@spiffcs spiffcs enabled auto-merge (squash) August 3, 2023 23:20
@spiffcs spiffcs requested a review from nurmi August 3, 2023 23:20
Copy link
Member

@nurmi nurmi left a comment

Choose a reason for hiding this comment

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

LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants