From 44067112c2050c088fb955d4c4ab71dd3bd240ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Fri, 9 Mar 2018 12:05:17 +0100
Subject: [PATCH] UNTESTED: Extract duplicate code from resolveImage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 storage/storage_reference.go | 37 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/storage/storage_reference.go b/storage/storage_reference.go
index b86cfd4b..60dfb9de 100644
--- a/storage/storage_reference.go
+++ b/storage/storage_reference.go
@@ -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 {
-							s.id = image.ID
-							break search
-						}
-					}
+				if imageMatchesRepo(image, s.name) {
+					s.id = image.ID
+					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
 		}