Skip to content

fix: stricter apk upstream parsing regex#1618

Closed
westonsteimel wants to merge 1 commit intomainfrom
fix-apk-upstream-regex
Closed

fix: stricter apk upstream parsing regex#1618
westonsteimel wants to merge 1 commit intomainfrom
fix-apk-upstream-regex

Conversation

@westonsteimel
Copy link
Copy Markdown
Contributor

@westonsteimel westonsteimel commented Feb 24, 2023

This is a follow-up to #1610. I had updated the regex match string locally to fix up some edge cases but apparently forgot to push them.

@westonsteimel westonsteimel requested a review from a team February 24, 2023 09:19
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Feb 24, 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-2d88753.txt │
                                                          │            sec/op            │
ImagePackageCatalogers/alpmdb-cataloger-2                                   12.70m ±  5%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             940.4µ ±  1%
ImagePackageCatalogers/python-package-cataloger-2                           3.309m ±  4%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   708.6µ ±  0%
ImagePackageCatalogers/javascript-package-cataloger-2                       381.1µ ±  1%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   527.8µ ± 13%
ImagePackageCatalogers/rpm-db-cataloger-2                                   538.4µ ±  3%
ImagePackageCatalogers/java-cataloger-2                                     11.59m ±  1%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     8.830µ ±  8%
ImagePackageCatalogers/apkdb-cataloger-2                                    529.8µ ±  1%
ImagePackageCatalogers/go-module-binary-cataloger-2                         19.80µ ±  1%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              1.046m ±  3%
ImagePackageCatalogers/portage-cataloger-2                                  329.3µ ±  1%
ImagePackageCatalogers/sbom-cataloger-2                                     107.1µ ±  1%
ImagePackageCatalogers/binary-cataloger-2                                   145.3µ ±  1%
geomean                                                                     481.7µ

                                                          │ ./.tmp/benchmark-2d88753.txt │
                                                          │             B/op             │
ImagePackageCatalogers/alpmdb-cataloger-2                                   5.061Mi ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             141.7Ki ± 0%
ImagePackageCatalogers/python-package-cataloger-2                           947.3Ki ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   155.9Ki ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                       95.55Ki ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   144.7Ki ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                   170.2Ki ± 0%
ImagePackageCatalogers/java-cataloger-2                                     2.722Mi ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     1.523Ki ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                    122.9Ki ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                         3.102Ki ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              314.7Ki ± 0%
ImagePackageCatalogers/portage-cataloger-2                                  75.38Ki ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                     13.04Ki ± 0%
ImagePackageCatalogers/binary-cataloger-2                                   21.17Ki ± 0%
geomean                                                                     106.9Ki

                                                          │ ./.tmp/benchmark-2d88753.txt │
                                                          │          allocs/op           │
ImagePackageCatalogers/alpmdb-cataloger-2                                    86.71k ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.159k ± 0%
ImagePackageCatalogers/python-package-cataloger-2                            15.48k ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                    3.458k ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                        1.252k ± 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.251k ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                           101.0 ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                               5.011k ± 0%
ImagePackageCatalogers/portage-cataloger-2                                   1.487k ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                       392.0 ± 0%
ImagePackageCatalogers/binary-cataloger-2                                     649.0 ± 0%
geomean                                                                      2.179k

Signed-off-by: Weston Steimel <weston.steimel@anchore.com>
@westonsteimel
Copy link
Copy Markdown
Contributor Author

Superseded by #1619

@westonsteimel westonsteimel deleted the fix-apk-upstream-regex branch February 24, 2023 11:09
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.

1 participant