Add E2E tests for aggregation, fix race condition #1141
Merged
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.
The bulk of this change is adding an E2E test to exercise aggregation. It aggregates only 1 source SBOM, with the hope that we can later add a second case with more than 1 source SBOM. While adding this, a race condition was discovered--the call to
ISbomConfigProvider.ClearCachewas sometimes being called before theTask.Runcalls inFileHasher.Runhad completed, leading to an Exception being thrown. Shout-out to @sfoslund for providing a fix that was tightly scoped and didn't involve extensive plumbing changes to makeFileHasher.Run--and it entire calling stack--fully async.Some changes were needed to the
FileHasherunit tests, since the test now needs to include execution of the code inside theTask.Runblock. These changes fell into 2 categories:filesobject before calling theFileHasher.Run(I put this into a helper method since needed this in multiple places).