Skip to content

Commit 6e1807d

Browse files
authored
wire up fix available version (#2905)
Signed-off-by: Alex Goodman <[email protected]>
1 parent fdb331b commit 6e1807d

File tree

5 files changed

+484
-15
lines changed

5 files changed

+484
-15
lines changed

grype/db/v6/vulnerability.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ func toPackageQualifiers(qualifiers *AffectedPackageQualifiers) []qualifier.Qual
254254
func toFix(affectedRanges []AffectedRange) vulnerability.Fix {
255255
var state vulnerability.FixState
256256
var versions []string
257+
var availables []vulnerability.FixAvailable
257258
for _, r := range affectedRanges {
258259
if r.Fix == nil {
259260
continue
@@ -262,6 +263,16 @@ func toFix(affectedRanges []AffectedRange) vulnerability.Fix {
262263
case FixedStatus:
263264
state = vulnerability.FixStateFixed
264265
versions = append(versions, r.Fix.Version)
266+
if r.Fix.Detail != nil && r.Fix.Detail.Available != nil {
267+
a := r.Fix.Detail.Available
268+
if a.Date != nil {
269+
availables = append(availables, vulnerability.FixAvailable{
270+
Version: r.Fix.Version,
271+
Date: *a.Date,
272+
Kind: a.Kind,
273+
})
274+
}
275+
}
265276
case NotAffectedFixStatus:
266277
// TODO: not handled yet
267278
case WontFixStatus:
@@ -278,8 +289,9 @@ func toFix(affectedRanges []AffectedRange) vulnerability.Fix {
278289
return vulnerability.Fix{}
279290
}
280291
return vulnerability.Fix{
281-
Versions: versions,
282-
State: state,
292+
Versions: versions,
293+
State: state,
294+
Available: availables,
283295
}
284296
}
285297

0 commit comments

Comments
 (0)