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: move defer after error to protect panic case #1670

Merged
merged 1 commit into from
Mar 15, 2023

Conversation

spiffcs
Copy link
Contributor

@spiffcs spiffcs commented Mar 15, 2023

No description provided.

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

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-1f879ce.txt │
                                                          │            sec/op            │
ImagePackageCatalogers/alpmdb-cataloger-2                                   11.65m ± 22%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             842.8µ ±  1%
ImagePackageCatalogers/python-package-cataloger-2                           3.061m ±  3%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   692.9µ ±  2%
ImagePackageCatalogers/javascript-package-cataloger-2                       362.3µ ±  2%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   499.6µ ±  2%
ImagePackageCatalogers/rpm-db-cataloger-2                                   499.9µ ±  9%
ImagePackageCatalogers/java-cataloger-2                                     11.15m ±  2%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     8.425µ ±  4%
ImagePackageCatalogers/apkdb-cataloger-2                                    568.8µ ±  4%
ImagePackageCatalogers/go-module-binary-cataloger-2                         18.75µ ±  2%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              971.2µ ±  1%
ImagePackageCatalogers/portage-cataloger-2                                  321.1µ ±  3%
ImagePackageCatalogers/sbom-cataloger-2                                     105.0µ ±  1%
ImagePackageCatalogers/binary-cataloger-2                                   184.3µ ±  1%
geomean                                                                     468.2µ

                                                          │ ./.tmp/benchmark-1f879ce.txt │
                                                          │             B/op             │
ImagePackageCatalogers/alpmdb-cataloger-2                                   5.061Mi ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                             124.0Ki ± 0%
ImagePackageCatalogers/python-package-cataloger-2                           946.7Ki ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                   155.9Ki ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                       90.90Ki ± 0%
ImagePackageCatalogers/dpkgdb-cataloger-2                                   144.8Ki ± 0%
ImagePackageCatalogers/rpm-db-cataloger-2                                   170.4Ki ± 0%
ImagePackageCatalogers/java-cataloger-2                                     2.721Mi ± 0%
ImagePackageCatalogers/graalvm-native-image-cataloger-2                     1.555Ki ± 0%
ImagePackageCatalogers/apkdb-cataloger-2                                    129.2Ki ± 0%
ImagePackageCatalogers/go-module-binary-cataloger-2                         3.133Ki ± 0%
ImagePackageCatalogers/dotnet-deps-cataloger-2                              314.7Ki ± 0%
ImagePackageCatalogers/portage-cataloger-2                                  75.46Ki ± 0%
ImagePackageCatalogers/sbom-cataloger-2                                     13.07Ki ± 0%
ImagePackageCatalogers/binary-cataloger-2                                   29.03Ki ± 0%
geomean                                                                     108.4Ki

                                                          │ ./.tmp/benchmark-1f879ce.txt │
                                                          │          allocs/op           │
ImagePackageCatalogers/alpmdb-cataloger-2                                    86.71k ± 0%
ImagePackageCatalogers/ruby-gemspec-cataloger-2                              2.049k ± 0%
ImagePackageCatalogers/python-package-cataloger-2                            15.49k ± 0%
ImagePackageCatalogers/php-composer-installed-cataloger-2                    3.457k ± 0%
ImagePackageCatalogers/javascript-package-cataloger-2                        1.214k ± 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.438k ± 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                                     872.0 ± 0%
geomean                                                                      2.219k

@spiffcs spiffcs merged commit 61362c0 into main Mar 15, 2023
@spiffcs spiffcs deleted the file-panic-protection branch March 15, 2023 19:29
spiffcs added a commit to deitch/syft that referenced this pull request Mar 21, 2023
* main: (47 commits)
  Deprecate config.yaml as valid config source; Add unit regression for correct config paths (anchore#1640)
  chore: Update syft bootstrap tools to latest versions. (anchore#1682)
  Update documentation: (anchore#1680)
  chore: Update Stereoscope to 7928713c391e20abaede6a029f4ce37b628a4c8b (anchore#1681)
  fix: reduce logging for bad dpkg lines (anchore#1675)
  fix ruby classifier (anchore#1678)
  feat: add shared dir for easier cleanup (anchore#1676)
  chore(deps): bump github.com/google/go-containerregistry (anchore#1672)
  chore(deps): bump actions/setup-go from 3 to 4 (anchore#1671)
  fix: move defer after error to protect panic case (anchore#1670)
  feat: add argocd, helm, kustomize and kubectl binary classifiers (anchore#1663)
  defer closing file (anchore#1668)
  fix: remove author contributing to javascript CPEs (anchore#1669)
  fix: more python matching support (anchore#1667)
  Update syft bootstrap tools to latest versions. (anchore#1666)
  feat: add ruby classifier (anchore#1665)
  Update syft bootstrap tools to latest versions. (anchore#1658)
  fix: improved Python binary detection (anchore#1648)
  fix: suppress some known incorrect vendor candidates for npm CPEs (anchore#1659)
  fix: sanitize SPDX LicenseRefs (anchore#1657)
  ...

Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
Signed-off-by: Christopher Phillips <christopher.phillips@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.

None yet

2 participants