fix(fs): fix cache key generation to use UUID#8275
Merged
DmitriyLewen merged 5 commits intoaquasecurity:mainfrom Jan 23, 2025
Merged
fix(fs): fix cache key generation to use UUID#8275DmitriyLewen merged 5 commits intoaquasecurity:mainfrom
DmitriyLewen merged 5 commits intoaquasecurity:mainfrom
Conversation
The cache key generation logic has been modified to use UUID with SHA256 hash to ensure uniqueness and consistency in cache keys. This change helps prevent cache key collisions during parallel execution while maintaining a standardized SHA256 format.
knqyf263
changed the title
danielciuraru86
approved these changes
Jan 22, 2025
Signed-off-by: knqyf263 <knqyf263@gmail.com>
Signed-off-by: knqyf263 <knqyf263@gmail.com>
Signed-off-by: knqyf263 <knqyf263@gmail.com>
Contributor
DmitriyLewen
left a comment
DmitriyLewen
left a comment
There was a problem hiding this comment.
LGTM.
Left small comment
This commit removes the fake UUID setup from the TestMixedConfigurationScan, TestJSONConfigScan, and TestYAMLConfigScan functions in fs_test.go.
DmitriyLewen
approved these changes
Jan 23, 2025
4 tasks
RingoDev
referenced
this pull request
in RingoDev/trivy
Feb 26, 2025
Signed-off-by: knqyf263 <knqyf263@gmail.com>
lebauce
added a commit
to DataDog/datadog-agent
that referenced
this pull request
May 5, 2025
aquasecurity/trivy#8275 changed the generation method for cache keys, that is used by the SBOM check to send either a heartbeat or a full SBOM. As the key is now different for every scan, we always send the full SBOM even if it's identical to the previous computed one. This commit computes the key based on the collected results so that its stays identical if the list of components hasn't changed.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Overview
This PR modifies the cache key generation logic to use UUID with SHA256 hash. This ensures uniqueness and consistency in cache keys while maintaining a standardized SHA256 format.
Description
calcCacheKeyfunction to generate SHA256 hash from UUIDSetFakeUUIDfor consistent test resultsRelated Issues
Checklist