tblyler/reg
1
0
Fork 0
mirror of https://github.com/genuinetools/reg.git synced 2024-05-13 01:38:32 -04:00
Code Issues Projects Releases Wiki Activity

Change the naming of the way Clair V3 reports are stored (#150)

Browse source 
* changed the naming of the way clair reports are stored

* revert changes to clair v2 method
This commit is contained in:
Darrian 2018-10-22 22:32:15 +01:00 committed by Jess Frazelle
parent 938012b555
commit 23cd8e4025
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clair/layerutil.go
View file

@ -52,7 +52,7 @@ func (c *Clair) NewClairV3Layer(r *registry.Registry, image string, fsLayer dist
}, nil
}
func (c *Clair) getLayers(r *registry.Registry, repo, tag string, filterEmpty bool) (map[int]distribution.Descriptor, error) {
func (c *Clair) getLayers(r *registry.Registry, repo, tag string, filterEmpty bool) (map[int]distribution.Descriptor, string, error) {
ok := true
// Get the manifest to pass to clair.
mf, err := r.ManifestV2(repo, tag)
@ -73,12 +73,12 @@ func (c *Clair) getLayers(r *registry.Registry, repo, tag string, filterEmpty bo
}
}
return filteredLayers, nil
return filteredLayers, mf.Config.Digest.String(), nil
}
m, err := r.ManifestV1(repo, tag)
if err != nil {
return nil, fmt.Errorf("getting the v1 manifest for %s:%s failed: %v", repo, tag, err)
return nil, "", fmt.Errorf("getting the v1 manifest for %s:%s failed: %v", repo, tag, err)
}
for i := 0; i < len(m.FSLayers); i++ {
@ -91,5 +91,5 @@ func (c *Clair) getLayers(r *registry.Registry, repo, tag string, filterEmpty bo
}
}
return filteredLayers, nil
return filteredLayers, filteredLayers[0].Digest.String(), nil
}

10
clair/vulns.go
View file

@ -19,7 +19,7 @@ func (c *Clair) Vulnerabilities(r *registry.Registry, repo, tag string) (Vulnera
VulnsBySeverity: make(map[string][]Vulnerability),
}
filteredLayers, err := c.getLayers(r, repo, tag, true)
filteredLayers, _, err := c.getLayers(r, repo, tag, true)
if err != nil {
return report, fmt.Errorf("getting filtered layers failed: %v", err)
}
@ -85,7 +85,7 @@ func (c *Clair) VulnerabilitiesV3(r *registry.Registry, repo, tag string) (Vulne
VulnsBySeverity: make(map[string][]Vulnerability),
}
layers, err := c.getLayers(r, repo, tag, false)
layers, reportName, err := c.getLayers(r, repo, tag, false)
if err != nil {
return report, fmt.Errorf("getting filtered layers failed: %v", err)
}
@ -95,7 +95,7 @@ func (c *Clair) VulnerabilitiesV3(r *registry.Registry, repo, tag string) (Vulne
return report, nil
}
report.Name = layers[0].Digest.String()
report.Name = reportName
clairLayers := []*clairpb.PostAncestryRequest_PostLayer{}
for i := len(layers) - 1; i >= 0; i-- {
@ -110,12 +110,12 @@ func (c *Clair) VulnerabilitiesV3(r *registry.Registry, repo, tag string) (Vulne
}
// Post the ancestry.
if err := c.PostAncestry(layers[0].Digest.String(), clairLayers); err != nil {
if err := c.PostAncestry(reportName, clairLayers); err != nil {
return report, fmt.Errorf("posting ancestry failed: %v", err)
}
// Get the ancestry.
vl, err := c.GetAncestry(layers[0].Digest.String())
vl, err := c.GetAncestry(reportName)
if err != nil {
return report, err
}