Skip to content

Set ResolvedInVersion for osv vuln scanning#43087

Merged
ksykulev merged 3 commits intomainfrom
39370-res-in
Apr 6, 2026
Merged

Set ResolvedInVersion for osv vuln scanning#43087
ksykulev merged 3 commits intomainfrom
39370-res-in

Conversation

@ksykulev
Copy link
Copy Markdown
Contributor

@ksykulev ksykulev commented Apr 6, 2026

Bug fix for
#42063
Related issue: Resolves #40057

Checklist for submitter

Testing

  • Added/updated automated tests
  • QA'd all new/changed functionality manually

For unreleased bug fixes in a release candidate, one of:

  • Confirmed that the fix is not expected to adversely impact load test results

Copilot AI review requested due to automatic review settings April 6, 2026 21:51
@ksykulev ksykulev requested a review from a team as a code owner April 6, 2026 21:51
Copy link
Copy Markdown

@claude claude Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Claude Code Review

This repository is configured for manual code reviews. Comment @claude review to trigger a review and subscribe this PR to future pushes, or @claude review once for a one-time review.

Tip: disable this comment in your organization's Code Review settings.

@ksykulev
Copy link
Copy Markdown
Contributor Author

ksykulev commented Apr 6, 2026

Before fix
Screenshot 2026-04-06 at 4 51 24 PM

After fix
Screenshot 2026-04-06 at 4 51 32 PM

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes OSV-based Ubuntu vulnerability matching so that detected SoftwareVulnerability records include the ResolvedInVersion (derived from OSV’s fixed version), aligning OSV scan results with existing vulnerability data expectations introduced in #42063.

Changes:

  • Populate fleet.SoftwareVulnerability.ResolvedInVersion from OSVVulnerability.Fixed when present.
  • Update OSV analyzer unit test expectations to include ResolvedInVersion.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
server/vulnerabilities/osv/analyzer.go Sets ResolvedInVersion for matched OSV vulnerabilities using the OSV fixed field.
server/vulnerabilities/osv/analyzer_test.go Updates expected vulnerabilities to assert ResolvedInVersion is set for range-based matches.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread server/vulnerabilities/osv/analyzer.go
Comment thread server/vulnerabilities/osv/analyzer_test.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@ksykulev ksykulev merged commit 4587edf into main Apr 6, 2026
42 checks passed
@ksykulev ksykulev deleted the 39370-res-in branch April 6, 2026 22:15
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 6, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 66.84%. Comparing base (0342347) to head (1d50b5a).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #43087      +/-   ##
==========================================
- Coverage   66.86%   66.84%   -0.02%     
==========================================
  Files        2578     2578              
  Lines      206869   206874       +5     
  Branches     9246     9246              
==========================================
- Hits       138328   138294      -34     
- Misses      55979    56007      +28     
- Partials    12562    12573      +11     
Flag Coverage Δ
backend 68.62% <100.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

ksykulev added a commit that referenced this pull request Apr 7, 2026
Bug fix for
#42063
**Related issue:** Resolves #40057

# Checklist for submitter

## Testing

- [x] Added/updated automated tests
- [x] QA'd all new/changed functionality manually

For unreleased bug fixes in a release candidate, one of:

- [ ] Confirmed that the fix is not expected to adversely impact load
test results

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
ksykulev added a commit that referenced this pull request Apr 7, 2026
Original PR: #43087
Bug fix for
#42063
**Related issue:** Resolves #40057

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

OSV feed Ubuntu: core

3 participants