Use reference.WithTag instead of manual string manipulation in Pull

Should not change behavior, except possibly failing early if the server
returns an invalid tag name.

Signed-off-by: Miloslav Trmač <[email protected]>

Closes: #1361
Approved by: rhatdan

pull.go

@@ -175,8 +175,8 @@ func Pull(ctx context.Context, imageName string, options PullOptions) error {
 			return errors.New("Non-docker transport is not supported, for --all-tags pulling")
 		}
 
-		repo := storageRef.DockerReference().Name()
-		dockerRef, err := alltransports.ParseImageName(transport + repo)
+		repo := reference.TrimNamed(storageRef.DockerReference())
+		dockerRef, err := alltransports.ParseImageName(transport + repo.Name())
 		if err != nil {
 			return errors.Wrapf(err, "error getting repository tags")
 		}
@@ -185,11 +185,15 @@ func Pull(ctx context.Context, imageName string, options PullOptions) error {
 			return errors.Wrapf(err, "error getting repository tags")
 		}
 		for _, tag := range tags {
-			name := repo + ":" + tag
+			tagged, err := reference.WithTag(repo, tag)
+			if err != nil {
+				errs = multierror.Append(errs, err)
+				continue
+			}
 			if options.ReportWriter != nil {
-				options.ReportWriter.Write([]byte("Pulling " + name + "\n"))
+				options.ReportWriter.Write([]byte("Pulling " + tagged.String() + "\n"))
 			}
-			ref, err := pullImage(ctx, options.Store, transport, name, options, systemContext)
+			ref, err := pullImage(ctx, options.Store, transport, tagged.String(), options, systemContext)
 			if err != nil {
 				errs = multierror.Append(errs, err)
 				continue