Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle breaking change in Trivy server API #3738

Merged
merged 1 commit into from
May 20, 2024

Conversation

nscuro
Copy link
Member

@nscuro nscuro commented May 20, 2024

Description

Handles breaking change in Trivy server API.

Application#libraries has been renamed to Application#packages in Trivy 0.51.2. The Library type no longer exists.

It's not possible to tell the Trivy version based on its API. To work around this, we now send both the packages and libraries fields with redundant information.

Fields that the API does not expect are silently ignored.

Addressed Issue

Fixes #3737

Additional Details

N/A

Checklist

  • I have read and understand the contributing guidelines
  • This PR fixes a defect, and I have provided tests to verify that the fix is effective
  • This PR implements an enhancement, and I have provided tests to verify that it works as intended
  • This PR introduces changes to the database model, and I have added corresponding update logic
  • This PR introduces new or alters existing behavior, and I have updated the documentation accordingly

@nscuro nscuro added defect Something isn't working integration/trivy Related to the Trivy integration labels May 20, 2024
@nscuro nscuro added this to the 4.12 milestone May 20, 2024
`Application#libraries` has been renamed to `Application#packages` in Trivy 0.51.2. The `Library` type no longer exists.

It's not possible to tell the Trivy version based on its API. To work around this, we now send both the `packages` and `libraries` fields with redundant information.

Fields that the API does not expect are silently ignored.

Fixes DependencyTrack#3737

Signed-off-by: nscuro <[email protected]>
Copy link

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
+0.01% (target: -1.00%) 57.14% (target: 70.00%)
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (e87c5cc) 21648 16402 75.77%
Head commit (08dfb0a) 21640 (-8) 16399 (-3) 75.78% (+0.01%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#3738) 14 8 57.14%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Codacy will stop sending the deprecated coverage status from June 5th, 2024. Learn more

@nscuro nscuro merged commit 74e477c into DependencyTrack:master May 20, 2024
10 of 11 checks passed
@nscuro nscuro deleted the issue-3737 branch May 20, 2024 14:45
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
defect Something isn't working integration/trivy Related to the Trivy integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TrivyAnalysisTaskIntegrationTest#test fails with Trivy v0.51.2
1 participant