Skip to content

Fix possible NPEs in TrivyAnalysisTask#4668

Merged
nscuro merged 3 commits intoDependencyTrack:masterfrom
nscuro:issue-4664
Feb 19, 2025
Merged

Fix possible NPEs in TrivyAnalysisTask#4668
nscuro merged 3 commits intoDependencyTrack:masterfrom
nscuro:issue-4664

Conversation

@nscuro
Copy link
Copy Markdown
Member

@nscuro nscuro commented Feb 19, 2025

Description

  • Fixes possible NPEs in TrivyAnalysisTask.
  • Execute Trivy integration tests against VulnerabilityAnalysisTask.
  • Fix components being made transient when they should be detached in VulnerabilityAnalysisTask.

Addressed Issue

Fixes #4664

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

This covers more logic than testing the `TrivyAnalysisTask` in isolation. This would've been able to catch DependencyTrack#4664.

Signed-off-by: nscuro <[email protected]>
@nscuro nscuro added defect Something isn't working integration/trivy Related to the Trivy integration labels Feb 19, 2025
@nscuro nscuro added this to the 4.13 milestone Feb 19, 2025
@codacy-production
Copy link
Copy Markdown

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
+0.01% (target: -1.00%) 71.43% (target: 70.00%)
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (a19dba0) 23124 18553 80.23%
Head commit (d971ef9) 23130 (+6) 18561 (+8) 80.25% (+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 (#4668) 14 10 71.43%

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 stopped sending the deprecated coverage status on June 5th, 2024. Learn more

@nscuro nscuro merged commit 3ec9a98 into DependencyTrack:master Feb 19, 2025
11 checks passed
@nscuro nscuro deleted the issue-4664 branch February 19, 2025 13:12
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 22, 2025
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.

TrivyAnalysisTask throws a NullPointerException for SBOM with component that does not have a PURL defined

1 participant