Skip to content

Commit 34b3c21

Browse files
committed
Fix the order for riskVersions
1 parent 33a0a14 commit 34b3c21

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

pkg/cvo/availableupdates.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -367,20 +367,16 @@ func loadRiskConditions(ctx context.Context, risks []string, riskVersions map[st
367367
return riskConditions
368368
}
369369

370-
// risksInOrder returns the list of risk names sorted by the associated version
370+
// risksInOrder returns the list of risk names sorted by the associated version in descending order.
371+
// When versions match, it is sorted by the risk names in ascending order.
371372
func risksInOrder(riskVersions map[string]riskWithVersion) []string {
372373
var ret []string
373374
var temp []riskWithVersion
374-
var keys []string
375375
for k := range riskVersions {
376-
keys = append(keys, k)
377-
}
378-
sort.Strings(keys)
379-
for _, k := range keys {
380376
temp = append(temp, riskVersions[k])
381377
}
382378
sort.SliceStable(temp, func(i, j int) bool {
383-
return temp[i].version.GT(temp[j].version)
379+
return temp[i].version.GT(temp[j].version) || temp[i].version.EQ(temp[j].version) && temp[i].risk.Name < temp[j].risk.Name
384380
})
385381
for _, v := range temp {
386382
ret = append(ret, v.risk.Name)

0 commit comments

Comments
 (0)