fix: add option to change java db repository #1179
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
nobbs
force-pushed
the
fix/java-db-repository-options
branch
from
2ba39ef
to
493116f
Compare
nobbs
changed the title
chen-keinan
reviewed
Apr 24, 2023
|
@nobbs thanks you for this contribution , I have left comments. |
chen-keinan
reviewed
Apr 24, 2023
nobbs
force-pushed
the
fix/java-db-repository-options
branch
from
732f71c
to
8ab7000
Compare
added 3 commits
April 24, 2023 11:47
the two methods already exist, so let's migrate the env vars to also use them, as it reduces repetition quite a lot
nobbs
force-pushed
the
fix/java-db-repository-options
branch
from
8ab7000
to
a2b28d6
Compare
|
I've taken care of your comments. Also, grouped the commits again. Should be good now; if not, let me know ;) |
|
@nobbs lgtm 🚀 |
chen-keinan
approved these changes
Apr 24, 2023
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
Trivy does support the use of custom vulnerability database repositories for both the regular DB as well as the Java one (since aquasecurity/trivy#3595) - trivy-operator only supports the former. This PR provides a way to configure the latter one, too.
Also updated the existing tests and added two simple new ones for this new option.
I've also refactored some repetitive env var setup in the
plugins/trivy/plugin.gofile by reusing the already existing methodsconstructEnvVarSourceFromConfigMapandconstructEnvVarSourceFromSecretwhere possible.Checklist