containers
/
image
mirror of https://github.com/containers/image.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UNTESTED: Extract duplicate code from resolveImage 

Extract an imageMatchesRepo helper from resolveImage.  This avoids
duplicating it, and a separate helper with "return" is easier to follow
than labeled breaks.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač 2018-03-09 12:05:17 +01:00
parent c0bc99122f
commit 44067112c2
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
storage/storage_reference.go
View File

@ -41,6 +41,19 @@ func newReference(transport storageTransport, reference, id string, name referen
}
}
// imageMatchesRepo returns true iff image.Names contains an element with the same repo as ref
func imageMatchesRepo(image *storage.Image, ref reference.Named) bool {
repo := ref.Name()
for _, name := range image.Names {
if named, err := reference.ParseNormalizedNamed(name); err == nil {
if named.Name() == repo {
return true
}
}
}
return false
}
// Resolve the reference's name to an image ID in the store, if there's already
// one present with the same name or ID, and return the image.
func (s *storageReference) resolveImage() (*storage.Image, error) {
@ -57,16 +70,10 @@ func (s *storageReference) resolveImage() (*storage.Image, error) {
// that the canonical reference can be implicitly resolved to the image.
images, err := s.transport.store.ImagesByDigest(s.digest)
if images != nil && err == nil {
repo := s.name.Name()
search:
for _, image := range images {
for _, name := range image.Names {
if named, err := reference.ParseNormalizedNamed(name); err == nil {
if named.Name() == repo {
if imageMatchesRepo(image, s.name) {
s.id = image.ID
break search
}
}
break
}
}
}
@ -80,17 +87,7 @@ func (s *storageReference) resolveImage() (*storage.Image, error) {
return nil, errors.Wrapf(err, "error reading image %q", s.id)
}
if s.name != nil {
repo := s.name.Name()
nameMatch := false
for _, name := range img.Names {
if named, err := reference.ParseNormalizedNamed(name); err == nil {
if named.Name() == repo {
nameMatch = true
break
}
}
}
if !nameMatch {
if !imageMatchesRepo(img, s.name) {
logrus.Errorf("no image matching reference %q found", s.StringWithinTransport())
return nil, ErrNoSuchImage
}