Improve sort logics
This commit is contained in:
		
							
								
								
									
										16
									
								
								scan/base.go
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								scan/base.go
									
									
									
									
									
								
							@@ -20,7 +20,6 @@ package scan
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"regexp"
 | 
			
		||||
	"sort"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"time"
 | 
			
		||||
 | 
			
		||||
@@ -266,12 +265,15 @@ func (l base) isAwsInstanceID(str string) bool {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (l *base) convertToModel() models.ScanResult {
 | 
			
		||||
	for _, p := range l.VulnInfos {
 | 
			
		||||
		//TODO
 | 
			
		||||
		sort.Sort(models.PackageInfosByName(p.Packages))
 | 
			
		||||
	}
 | 
			
		||||
	//TODO
 | 
			
		||||
	//  sort.Sort(l.VulnInfos)
 | 
			
		||||
	//TODO Remove
 | 
			
		||||
	//  for _, p := range l.VulnInfos {
 | 
			
		||||
	//      sort.Slice(p.Packages, func(i, j int) bool {
 | 
			
		||||
	//          return p.Packages[i].Name < p.Packages[j].Name
 | 
			
		||||
	//      })
 | 
			
		||||
	//  }
 | 
			
		||||
	//  sort.Slice(l.VulnInfos, func(i, j int) bool {
 | 
			
		||||
	//      return l.VulnInfos[i].CveID < l.VulnInfos[j].CveID
 | 
			
		||||
	//  })
 | 
			
		||||
 | 
			
		||||
	ctype := l.ServerInfo.Containers.Type
 | 
			
		||||
	if l.ServerInfo.Container.ContainerID != "" && ctype == "" {
 | 
			
		||||
 
 | 
			
		||||
@@ -20,7 +20,6 @@ package scan
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"regexp"
 | 
			
		||||
	"sort"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"time"
 | 
			
		||||
 | 
			
		||||
@@ -770,7 +769,9 @@ func (o *redhat) parseYumUpdateinfo(stdout string) (result []distroAdvisoryCveID
 | 
			
		||||
				for cveID := range cveIDsSetInThisSection {
 | 
			
		||||
					foundCveIDs = append(foundCveIDs, cveID)
 | 
			
		||||
				}
 | 
			
		||||
				sort.Strings(foundCveIDs)
 | 
			
		||||
				//TODO remove
 | 
			
		||||
				//  sort.Strings(foundCveIDs)
 | 
			
		||||
 | 
			
		||||
				result = append(result, distroAdvisoryCveIDs{
 | 
			
		||||
					DistroAdvisory: advisory,
 | 
			
		||||
					CveIDs:         foundCveIDs,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user