Merge pull request #21457 from smarterclayton/mirror_stdin

cli: Teach `oc image mirror` to accept a file from stdin

Author: openshift-merge-robot

contrib/completions/bash/oc

@@ -14,13 +14,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/distribution/registry/api/errcode"
-
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/distribution"
-	registryapiv2 "github.com/docker/distribution/registry/api/v2"
 	dockerarchive "github.com/docker/docker/pkg/archive"
 	digest "github.com/opencontainers/go-digest"
 
@@ -256,28 +253,6 @@ func parseMappings(images, paths []string, requireEmpty bool) ([]Mapping, error)
 	return mappings, nil
 }
 
-type imageNotFound struct {
-	msg string
-	err error
-}
-
-func IsImageNotFound(err error) bool {
-	switch t := err.(type) {
-	case errcode.Errors:
-		return len(t) == 1 && IsImageNotFound(t[0])
-	case errcode.Error:
-		return t.Code == registryapiv2.ErrorCodeManifestUnknown
-	case *imageNotFound:
-		return true
-	default:
-		return false
-	}
-}
-
-func (e *imageNotFound) Error() string {
-	return e.msg
-}
-
 func (o *Options) Complete(cmd *cobra.Command, args []string) error {
 	if err := o.FilterOptions.Complete(cmd.Flags()); err != nil {
 		return err
@@ -334,14 +309,14 @@ func (o *Options) Run() error {
 
 				srcManifest, srcDigest, location, err := imagemanifest.FirstManifest(ctx, from, repo, o.FilterOptions.Include)
 				if err != nil {
-					if IsImageNotFound(err) {
+					if imagemanifest.IsImageNotFound(err) {
 						var msg string
 						if len(o.Mappings) == 1 {
 							msg = "image does not exist"
 						} else {
 							msg = fmt.Sprintf("image %q does not exist", from)
 						}
-						return &imageNotFound{msg: msg, err: err}
+						return imagemanifest.NewImageNotFound(msg, err)
 					}
 					return fmt.Errorf("unable to read image %s: %v", from, err)
 				}

contrib/completions/zsh/oc

@@ -0,0 +1,32 @@
+package manifest
+
+import (
+	"github.com/docker/distribution/registry/api/errcode"
+	registryapiv2 "github.com/docker/distribution/registry/api/v2"
+)
+
+type imageNotFound struct {
+	msg string
+	err error
+}
+
+func NewImageNotFound(msg string, err error) error {
+	return &imageNotFound{msg: msg, err: err}
+}
+
+func IsImageNotFound(err error) bool {
+	switch t := err.(type) {
+	case errcode.Errors:
+		return len(t) == 1 && IsImageNotFound(t[0])
+	case errcode.Error:
+		return t.Code == registryapiv2.ErrorCodeManifestUnknown
+	case *imageNotFound:
+		return true
+	default:
+		return false
+	}
+}
+
+func (e *imageNotFound) Error() string {
+	return e.msg
+}

pkg/oc/cli/image/extract/extract.go

@@ -3,6 +3,7 @@ package mirror
 import (
 	"bufio"
 	"fmt"
+	"io"
 	"os"
 	"strings"
 	"sync"
@@ -104,14 +105,17 @@ func parseArgs(args []string, overlap map[string]string) ([]Mapping, error) {
 	return mappings, nil
 }
 
-func parseFile(filename string, overlap map[string]string) ([]Mapping, error) {
+func parseFile(filename string, overlap map[string]string, in io.Reader) ([]Mapping, error) {
 	var fileMappings []Mapping
-	f, err := os.Open(filename)
-	if err != nil {
-		return nil, err
+	if filename != "-" {
+		f, err := os.Open(filename)
+		if err != nil {
+			return nil, err
+		}
+		defer f.Close()
+		in = f
 	}
-	defer f.Close()
-	s := bufio.NewScanner(f)
+	s := bufio.NewScanner(in)
 	lineNumber := 0
 	for s.Scan() {
 		line := s.Text()

pkg/oc/cli/image/manifest/errors.go

@@ -85,6 +85,7 @@ type MirrorImageOptions struct {
 	Insecure           bool
 	SkipMount          bool
 	SkipMultipleScopes bool
+	SkipMissing        bool
 	Force              bool
 
 	MaxRegistry    int
@@ -127,6 +128,7 @@ func NewCmdMirrorImage(name string, streams genericclioptions.IOStreams) *cobra.
 
 	flag.BoolVar(&o.DryRun, "dry-run", o.DryRun, "Print the actions that would be taken and exit without writing to the destinations.")
 	flag.BoolVar(&o.Insecure, "insecure", o.Insecure, "Allow push and pull operations to registries to be made over HTTP")
+	flag.BoolVar(&o.SkipMissing, "skip-missing", o.SkipMissing, "If an input image is not found, skip them.")
 	flag.BoolVar(&o.SkipMount, "skip-mount", o.SkipMount, "Always push layers instead of cross-mounting them")
 	flag.BoolVar(&o.SkipMultipleScopes, "skip-multiple-scopes", o.SkipMultipleScopes, "Some registries do not support multiple scopes passed to the registry login.")
 	flag.BoolVar(&o.Force, "force", o.Force, "Attempt to write all layers and manifests even if they exist in the remote repository.")
@@ -151,7 +153,7 @@ func (o *MirrorImageOptions) Complete(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	for _, filename := range o.Filenames {
-		mappings, err := parseFile(filename, overlap)
+		mappings, err := parseFile(filename, overlap, o.In)
 		if err != nil {
 			return err
 		}
@@ -364,6 +366,12 @@ func (o *MirrorImageOptions) plan() (*plan, error) {
 					w.Parallel(func() {
 						desc, err := srcRepo.Tags(ctx).Get(ctx, srcTag)
 						if err != nil {
+							if o.SkipMissing && imagemanifest.IsImageNotFound(err) {
+								ref := src.ref
+								ref.Tag = srcTag
+								fmt.Fprintf(o.ErrOut, "warning: Image %s does not exist and will not be mirrored\n", ref)
+								return
+							}
 							plan.AddError(retrieverError{src: src.ref, err: fmt.Errorf("unable to retrieve source image %s by tag %s: %v", src.ref, srcTag, err)})
 							return
 						}