fix(db): use schema version as tag only for trivy-db and trivy-java-db registries by default
#6219
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
Mar 4, 2024
There was a problem hiding this comment.
If I understand correctly, the current change will be breaking compatibility. Those who specify --db-repository myregistry will see an error after this PR since their repository is now myregistry:2, but Trivy accesses myregistry. Am I correct?
What if adding a tag only when a tag not specified?
--db-repository ghcr.io/aquasecurity/trivy-db=> Accessghcr.io/aquasecurity/trivy-db:2--db-repository ghcr.io/aquasecurity/trivy-db:2=> Accessghcr.io/aquasecurity/trivy-db:2--db-repository myregistry=> Accessmyregistry:2--db-repository myregistry:2=> Accessmyregistry:2--db-repository myregistry:3=> Accessmyregistry:3
DmitriyLewen
force-pushed
the
fix/dont-add-schema-version-for-external-repos
branch
from
e44a3d4 to
d8a0c03
Compare
|
@knqyf263 I updated this PR using your solution |
|
And the default value should be |
|
You are right. |
knqyf263
approved these changes
Mar 11, 2024
| @@ -78,6 +79,11 @@ func NewClient(cacheDir string, quiet bool, opts ...Option) *Client { | |||
| opt(o) | |||
| } | |||
|
|
|||
| // Add the schema version as a tag if the tag doesn't exist. | |||
There was a problem hiding this comment.
Can you add a comment this is for backward compatibility? We want to remove it after a while.
There was a problem hiding this comment.
Added comment in 91bcb0a
| @@ -82,8 +83,12 @@ func (u *Updater) Update() error { | |||
| } | |||
|
|
|||
| func Init(cacheDir, javaDBRepository string, skip, quiet bool, registryOption ftypes.RegistryOptions) { | |||
| // Add the schema version as a tag if the tag doesn't exist. | |||
There was a problem hiding this comment.
Added comment in 91bcb0a
knqyf263
approved these changes
Mar 11, 2024
7 tasks
7 tasks
romulets
added a commit
to romulets/cloudbeat
that referenced
this pull request
Aug 13, 2024
- Fix registry version aquasecurity/trivy#6219; \n- Fix replace zap with slog aquasecurity/trivy#6466; \n - The fix with slog used a zap to slog bridge (official from zap, but exp). It didn't have a license file, so I hardcoded a commit version that had; \n- Adopt opts.Align() to validate options object;
romulets
added a commit
to romulets/cloudbeat
that referenced
this pull request
Aug 13, 2024
- Fix registry version aquasecurity/trivy#6219; \n- Fix replace zap with slog aquasecurity/trivy#6466; \n - The fix with slog used a zap to slog bridge (official from zap, but exp). It didn't have a license file, so I hardcoded a commit version that had; \n- Adopt opts.Align() to validate options object;
romulets
added a commit
to elastic/cloudbeat
that referenced
this pull request
Aug 13, 2024
* Bump trivy to v0.49.1
* Bump trivy to v0.51.4
- Fix registry version aquasecurity/trivy#6219;
- Fix replace zap with slog aquasecurity/trivy#6466;
- The fix with slog used a zap to slog bridge (official from zap, but exp). It didn't have a license file, so I hardcoded a commit version that had;
- Adopt opts.Align() to validate options object;
* Bump trivy to v0.52.2
* Temp change the workflow trigger to test changes
* Free up space on runner
* Bump trivy to v0.53.0
- Fix go clear cache aquasecurity/trivy#7010
* Bump trivy to v0.54.1
- Fix --vuln-type flag renamed into --pkg-types aquasecurity/trivy#7104;
- Adopt package relationships aquasecurity/trivy#7237
* Rollback CI run on target
* Clean 'scan cache clean' code and add timeout to it
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
We add schema version as tag only for all registries (both default and external).
To avoid limiting users, we only need to do this for the default registries (
ghcr.io/aquasecurity/trivy-dbandghcr.io/aquasecurity/trivy-java-db).Related issues
Checklist