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(fs): add missing defered Cleanup() call to post analyzer fs #7882

Merged
merged 1 commit into from
Nov 7, 2024

Conversation

jinroh
Copy link
Contributor

@jinroh jinroh commented Nov 6, 2024

Description

Trivy appears to be leaking /tmp/analyzer-fs-* directories when using FS artifacts.

This PR adds the call to Cleanup() that is already done in VM and Image artifacts.

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@CLAassistant
Copy link

CLAassistant commented Nov 6, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@DmitriyLewen DmitriyLewen left a comment

Choose a reason for hiding this comment

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

@jinroh thanks!

LGTM. cc. @knqyf263

@DmitriyLewen DmitriyLewen changed the title fs: missing defered Cleanup() call to post analyzer fs fix(fs): add missing defered Cleanup() call to post analyzer fs Nov 7, 2024
@DmitriyLewen
Copy link
Contributor

@jinroh can you sign CLA?

@jinroh
Copy link
Contributor Author

jinroh commented Nov 7, 2024

@jinroh can you sign CLA?

done.

Copy link
Collaborator

@knqyf263 knqyf263 left a comment

Choose a reason for hiding this comment

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

Filesystem scanning is not supposed to create any files in the directory, so I thought we didn't need to clean it up, but as you pointed out, the empty directory created when initializing will remain.

tmpDir, err := os.MkdirTemp("", "analyzer-fs-*")

Thanks for your contribution.

@knqyf263 knqyf263 added this pull request to the merge queue Nov 7, 2024
Merged via the queue into aquasecurity:main with commit ab32297 Nov 7, 2024
12 of 13 checks passed
@aqua-bot aqua-bot mentioned this pull request Nov 7, 2024
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.

4 participants