fix(misconf): don't shift ignore rule related to code #6708
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
simar7
reviewed
May 17, 2024
simar7
reviewed
May 17, 2024
| ids: []string{"rule-2"}, | ||
| }, | ||
| shouldIgnore: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { |
There was a problem hiding this comment.
nit: Since we can pass a slice of ids of rules, should we create a test case as such:
{
name: "multiple ignore rules on the same line",
src: `# trivy:ignore:rule-1
# trivy:ignore:rule-2
test #trivy:ignore:rule-3
`,
args: args{
metadata: metadataWithLine(filename, 3),
ids: []string{"rule-1", "rule-2", "rule-3", "non-existing-rule"},
},
shouldIgnore: true,
},
simar7
reviewed
May 17, 2024
| if _, exists := rule.sections["id"]; !exists { | ||
| return Rule{}, errors.New("rule section with the `ignore` key is required") | ||
| if _, exists := sections["id"]; !exists { | ||
| return nil, errors.New("rule section with the `ignore` key is required") |
There was a problem hiding this comment.
Are there any callers of this func that we need to add a check for when we return nil here? I only see this and it seems like this is covered.
There was a problem hiding this comment.
if comment parsing fails, we skip it https://github.com/aquasecurity/trivy/pull/6708/files#diff-c1fe13f24e97f852991501a2535948a2ff13ef4e36564313e85754d8f9c6f35eR58-R60
There was a problem hiding this comment.
Fair enough. I guess it is subjective as I only tend to return nil for structs that are passed around by reference. But I'm fine with this.
simar7
approved these changes
May 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR prevents a range shift for a rule that is on the same line as the code.
Related issues
Checklist