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

Backport: Handle breaking change in Trivy server API #3785

Merged
merged 1 commit into from
Jun 1, 2024

Conversation

nscuro
Copy link
Member

@nscuro nscuro commented Jun 1, 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
Backports #3738

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

`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 <nscuro@protonmail.com>
@nscuro nscuro added the defect Something isn't working label Jun 1, 2024
@nscuro nscuro added this to the 4.11.2 milestone Jun 1, 2024
Copy link

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
Report missing for a0c50451 57.14% (target: 70.00%)
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (a0c5045) Report Missing Report Missing Report Missing
Head commit (4902a34) 22075 16773 75.98%

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 (#3785) 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

Footnotes

  1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct.

@nscuro nscuro merged commit 3af6f5a into DependencyTrack:4.11.x Jun 1, 2024
3 of 5 checks passed
@nscuro nscuro deleted the backport-pr-3738 branch June 6, 2024 08:40
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
defect Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant