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

feat(misconf): enable --policy flag to accept directory and files both #4777

Merged
merged 5 commits into from
Jul 13, 2023
Merged

feat(misconf): enable --policy flag to accept directory and files both #4777

merged 5 commits into from
Jul 13, 2023

Conversation

nikpivkin
Copy link
Contributor

Description

Added support for --policy flag to accept both directory and file.

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

@nikpivkin nikpivkin marked this pull request as ready for review July 5, 2023 09:37
@nikpivkin nikpivkin requested a review from knqyf263 as a code owner July 5, 2023 09:37
@knqyf263 knqyf263 requested a review from simar7 July 5, 2023 10:41
@simar7
Copy link
Member

simar7 commented Jul 5, 2023 •
edited
Loading

lgtm, I tested and it works fine. We will need to do the following as part of this PR:

  1. revert the commit for this PR docs: clarifying a dir path is required for custom policies #4716 - it was a short term doc improvement.
  2. add documentation to explain to users this change, probably when you do 1) you can add this
  3. update the CLI flag help text

simar7
simar7 approved these changes Jul 11, 2023
View reviewed changes
Copy link
Member

@simar7 simar7 left a comment

Choose a reason for hiding this comment

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

lgtm

@knqyf263 knqyf263 added this pull request to the merge queue Jul 13, 2023
Merged via the queue into aquasecurity:main with commit d0d543b Jul 13, 2023
16 checks passed
@nikpivkin nikpivkin deleted the feat-conf-policy-f branch July 20, 2023 16:06
AnaisUrlichs pushed a commit to AnaisUrlichs/trivy that referenced this pull request Aug 10, 2023
@nikpivkin @AnaisUrlichs
feat(misconf): enable --policy flag to accept directory and files both (
76c4ea8 
aquasecurity#4777)

* feat(misconf): enable --policy flag to accept directory and files both

* fix test

* Revert "clarifying a dir path is required for custom policies (aquasecurity#4716)"

This reverts commit 8a1aa44.

* update doc

* update the flag description
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simar7 simar7 simar7 approved these changes

@knqyf263 knqyf263 knqyf263 approved these changes

@AnaisUrlichs AnaisUrlichs AnaisUrlichs approved these changes

@itaysk itaysk Awaiting requested review from itaysk

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

Successfully merging this pull request may close these issues.

feat(misconf): Enable --policy flag to accept directory and files both
4 participants
@nikpivkin @simar7 @knqyf263 @AnaisUrlichs