Improve error message when a release input is invalid

The error message when an image-reference points to a non-existent
image can be shortened and made more succinct since it is very
common.

Clean up the output of new to be easier to scan.

Author: smarterclayton

pkg/oc/cli/admin/release/image_mapper.go

@@ -131,7 +131,7 @@ func NewTransformFromImageStreamFile(path string, input *imageapi.ImageStream, a
 			continue
 		}
 		if len(tag.From.Name) == 0 {
-			return nil, fmt.Errorf("Image file %q did not specify a valid target location for tag %q - no from.name for the tag", path, tag.Name)
+			return nil, fmt.Errorf("no from.name for the tag %s", tag.Name)
 		}
 		ref := ImageReference{SourceRepository: tag.From.Name}
 		for _, inputTag := range input.Spec.Tags {
@@ -145,7 +145,7 @@ func NewTransformFromImageStreamFile(path string, input *imageapi.ImageStream, a
 				klog.V(2).Infof("Image file %q referenced an image %q that is not part of the input images, skipping", path, tag.From.Name)
 				continue
 			}
-			return nil, fmt.Errorf("image file %q referenced image %q that is not part of the input images", path, tag.Name)
+			return nil, fmt.Errorf("no input image tag named %q", tag.Name)
 		}
 		references[tag.Name] = ref
 	}

pkg/oc/cli/admin/release/new.go

@@ -724,7 +724,7 @@ func (o *NewOptions) Run() error {
 	case len(operators) == 0:
 		fmt.Fprintf(o.ErrOut, "warning: No operator metadata was found, no operators will be part of the release.\n")
 	default:
-		fmt.Fprintf(o.Out, "Built release image from %d operators\n", len(operators))
+		fmt.Fprintf(o.ErrOut, "info: Built release image from %d operators\n", len(operators))
 	}
 
 	return nil
@@ -871,7 +871,7 @@ func (o *NewOptions) extractManifests(is *imageapi.ImageStream, name string, met
 			return err
 		}
 		o.cleanupFns = append(o.cleanupFns, func() { os.RemoveAll(dir) })
-		fmt.Fprintf(o.ErrOut, "info: Manifests will be extracted to %s\n", dir)
+		klog.V(2).Infof("Manifests will be extracted to %s\n", dir)
 	}
 
 	verifier := imagemanifest.NewVerifier()
@@ -959,9 +959,9 @@ func (o *NewOptions) extractManifests(is *imageapi.ImageStream, name string, met
 					return false, err
 				}
 				if custom {
-					fmt.Fprintf(o.Out, "Loading override manifests from %s: %s ...\n", tag.Name, m.ImageRef.Exact())
+					fmt.Fprintf(o.ErrOut, "info: Loading override %s %s\n", m.ImageRef.Exact(), tag.Name)
 				} else {
-					fmt.Fprintf(o.Out, "Loading manifests from %s: %s ...\n", tag.Name, m.ImageRef.ID)
+					fmt.Fprintf(o.ErrOut, "info: Loading %s %s\n", m.ImageRef.ID, tag.Name)
 				}
 				return true, nil
 			},
@@ -1291,7 +1291,7 @@ func writePayload(w io.Writer, is *imageapi.ImageStream, cm *CincinnatiMetadata,
 			klog.V(2).Infof("Perform image replacement based on inclusion of %s", path)
 			transform, err = NewTransformFromImageStreamFile(path, is, allowMissingImages)
 			if err != nil {
-				return fmt.Errorf("operator %q failed to map images: %s", name, err)
+				return fmt.Errorf("operator %q contained an invalid image-references file: %s", name, err)
 			}
 		}
 
@@ -1511,7 +1511,7 @@ func pruneUnreferencedImageStreams(out io.Writer, is *imageapi.ImageStream, meta
 		updated = append(updated, tag)
 	}
 	if len(updated) != len(is.Spec.Tags) {
-		fmt.Fprintf(out, "info: Included %d referenced images into the payload\n", len(updated))
+		fmt.Fprintf(out, "info: Included %d images in the release\n", len(updated))
 		is.Spec.Tags = updated
 	}
 	return nil