feat(misconf): Support custom URLs for policy bundle #4834
Merged
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
knqyf263
reviewed
Jul 20, 2023
simar7
force-pushed
the
custom-url-policy-bundle
branch
from
fcfb7d8
to
ed01dd3
Compare
AnaisUrlichs
approved these changes
Jul 24, 2023
This PR adds support for custom policy bundles to be specified with a flag `--policy-bundle-url` as an option to Trivy. Fixes: #4672 Signed-off-by: Simar <simar@linux.com>
Signed-off-by: Simar <simar@linux.com>
Signed-off-by: Simar <simar@linux.com>
Signed-off-by: Simar <simar@linux.com>
simar7
force-pushed
the
custom-url-policy-bundle
branch
from
95c38c5
to
1ec96d7
Compare
knqyf263
reviewed
Jul 25, 2023
pkg/policy/policy.go
Outdated
| @@ -76,10 +76,13 @@ func NewClient(cacheDir string, quiet bool, opts ...Option) (*Client, error) { | |||
| }, nil | |||
| } | |||
|
|
|||
| func (c *Client) populateOCIArtifact() error { | |||
| func (c *Client) populateOCIArtifact(policyBundleRepository string) error { | |||
There was a problem hiding this comment.
What if adding policyRepo here rather than passing the repo to each method?
Lines 49 to 54 in 1ec96d7
There was a problem hiding this comment.
I mean adding repo to NewClient.
func NewClient(cacheDir, repo string, quiet bool, opts ...Option) (*Client, error) {
Line 63 in 1ec96d7
Signed-off-by: Simar <simar@linux.com>
knqyf263
approved these changes
Jul 26, 2023
AnaisUrlichs
pushed a commit
to AnaisUrlichs/trivy
that referenced
this pull request
Aug 10, 2023
* feat(misconf): Support custom URLs for policy bundle This PR adds support for custom policy bundles to be specified with a flag `--policy-bundle-url` as an option to Trivy. Fixes: aquasecurity#4672 Signed-off-by: Simar <simar@linux.com> * update docs Signed-off-by: Simar <simar@linux.com> * rename flag to `--policy-bundle-repository` Signed-off-by: Simar <simar@linux.com> * fix field * rebase and update docs Signed-off-by: Simar <simar@linux.com> * set policyBundleRepo on client Signed-off-by: Simar <simar@linux.com> --------- Signed-off-by: Simar <simar@linux.com>
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 adds support for custom policy bundles to be specified with a flag
--policy-bundle-urlas an option to Trivy.Related issues
Checklist