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.

Sign up for GitHub

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

Jump to bottom

fix(cli): Handle empty ignore files more gracefully #7962

Merged
merged 5 commits into from
Nov 26, 2024
Merged

fix(cli): Handle empty ignore files more gracefully #7962

merged 5 commits into from
Nov 26, 2024

Conversation

simar7
Copy link
Member

@simar7 simar7 commented Nov 20, 2024 •
edited
Loading

Description

Also adds a log message to the debug stream when such a case occurs.

trivy --debug config --ignorefile ./invalid-file.yaml  /tmp
<snip>
2024-11-19T23:55:01-07:00       DEBUG   Specified ignore file does not exist        file="./invalid-file.yaml"
</snip>

Related issues

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).

@simar7 simar7 requested a review from nikpivkin November 20, 2024 07:00
@simar7 simar7 marked this pull request as ready for review November 20, 2024 19:00
@simar7 simar7 requested a review from knqyf263 as a code owner November 20, 2024 19:00
knqyf263
knqyf263 reviewed Nov 21, 2024
View reviewed changes
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.

It looks good! I left small comments.

pkg/result/ignore.go Show resolved Hide resolved
pkg/result/ignore.go Outdated Show resolved Hide resolved
@simar7 @knqyf263
Update pkg/result/ignore.go
7b341b9 
Co-authored-by: Teppei Fukuda <knqyf263@gmail.com>
knqyf263
knqyf263 reviewed Nov 22, 2024
View reviewed changes
pkg/result/ignore_test.go Outdated Show resolved Hide resolved
@simar7 simar7 requested a review from knqyf263 November 23, 2024 00:32
@knqyf263 knqyf263 added this pull request to the merge queue Nov 26, 2024
Merged via the queue into aquasecurity:main with commit 4cfb2a9 Nov 26, 2024
12 checks passed
@aqua-bot aqua-bot mentioned this pull request Nov 26, 2024
Merged
@simar7 simar7 deleted the bug-7934 branch November 26, 2024 06:50
@matthewriedel-flux matthewriedel-flux mentioned this pull request Dec 12, 2024
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knqyf263 knqyf263 knqyf263 approved these changes

@nikpivkin nikpivkin nikpivkin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bug(cli): Don't error out on empty trivy config yaml file
3 participants
@simar7 @knqyf263 @nikpivkin