arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api: add FeatureFromDatabaseModel

Browse Source 
This also handles replacing the DB identifier for a maximum version with
the string "None".
This commit is contained in:
Jimmy Zelinskie 2016-02-04 16:49:38 -05:00
parent 883be8769f
commit c504d2ed0e
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api/v1/models.go
View File

@ -129,11 +129,7 @@ func VulnerabilityFromDatabaseModel(dbVuln database.Vulnerability, withFixedIn b
if withFixedIn {
for _, dbFeatureVersion := range dbVuln.FixedIn {
vuln.FixedIn = append(vuln.FixedIn, Feature{
Name: dbFeatureVersion.Feature.Name,
Namespace: dbFeatureVersion.Feature.Namespace.Name,
Version: dbFeatureVersion.Version.String(),
})
vuln.FixedIn = append(vuln.FixedIn, FeatureFromDatabaseModel(dbFeatureVersion))
}
}
@ -147,11 +143,30 @@ type Feature struct {
Vulnerabilities []Vulnerability `json:"Vulnerabilities,omitempty"`
}
func FeatureFromDatabaseModel(dbFeatureVersion database.FeatureVersion) Feature {
versionStr := dbFeatureVersion.Version.String()
if versionStr == types.MaxVersion.String() {
versionStr = "None"
}
return Feature{
Name: dbFeatureVersion.Feature.Name,
Namespace: dbFeatureVersion.Feature.Namespace.Name,
Version: versionStr,
}
}
func (f Feature) DatabaseModel() (database.FeatureVersion, error) {
version, err := types.NewVersion(f.Version)
var version types.Version
if f.Version == "None" {
version = types.MaxVersion
} else {
var err error
version, err = types.NewVersion(f.Version)
if err != nil {
return database.FeatureVersion{}, err
}
}
return database.FeatureVersion{
Feature: database.Feature{