wire printflags through additional cmds

pkg/kubectl/cmd/cp.go

@@ -28,8 +28,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	restclient "k8s.io/client-go/rest"
+	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions"
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
 
 	"github.com/renstrom/dedent"
@@ -61,8 +64,26 @@ var (
 		/file/path for a local file`)
 )
 
+type CopyOptions struct {
+	Container string
+	Namespace string
+
+	ClientConfig *restclient.Config
+	Clientset    internalclientset.Interface
+
+	genericclioptions.IOStreams
+}
+
+func NewCopyOptions(ioStreams genericclioptions.IOStreams) *CopyOptions {
+	return &CopyOptions{
+		IOStreams: ioStreams,
+	}
+}
+
 // NewCmdCp creates a new Copy command.
-func NewCmdCp(f cmdutil.Factory, cmdOut, cmdErr io.Writer) *cobra.Command {
+func NewCmdCp(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
+	o := NewCopyOptions(ioStreams)
+
 	cmd := &cobra.Command{
 		Use: "cp <file-spec-src> <file-spec-dest>",
 		DisableFlagsInUseLine: true,
@@ -70,7 +91,8 @@ func NewCmdCp(f cmdutil.Factory, cmdOut, cmdErr io.Writer) *cobra.Command {
 		Long:    "Copy files and directories to and from containers.",
 		Example: cpExample,
 		Run: func(cmd *cobra.Command, args []string) {
-			cmdutil.CheckErr(runCopy(f, cmd, cmdOut, cmdErr, args))
+			cmdutil.CheckErr(o.Complete(f, cmd))
+			cmdutil.CheckErr(o.Run(args))
 		},
 	}
 	cmd.Flags().StringP("container", "c", "", "Container name. If omitted, the first container in the pod will be chosen")
@@ -119,10 +141,35 @@ func extractFileSpec(arg string) (fileSpec, error) {
 	return fileSpec{}, errFileSpecDoesntMatchFormat
 }
 
-func runCopy(f cmdutil.Factory, cmd *cobra.Command, out, cmderr io.Writer, args []string) error {
+func (o *CopyOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
+	o.Container = cmdutil.GetFlagString(cmd, "container")
+
+	var err error
+	o.Namespace, _, err = f.DefaultNamespace()
+	if err != nil {
+		return err
+	}
+
+	o.Clientset, err = f.ClientSet()
+	if err != nil {
+		return err
+	}
+
+	o.ClientConfig, err = f.ClientConfig()
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (o *CopyOptions) Validate(cmd *cobra.Command, args []string) error {
 	if len(args) != 2 {
 		return cmdutil.UsageErrorf(cmd, cpUsageStr)
 	}
+	return nil
+}
+
+func (o *CopyOptions) Run(args []string) error {
 	srcSpec, err := extractFileSpec(args[0])
 	if err != nil {
 		return err
@@ -132,19 +179,19 @@ func runCopy(f cmdutil.Factory, cmd *cobra.Command, out, cmderr io.Writer, args
 		return err
 	}
 	if len(srcSpec.PodName) != 0 {
-		return copyFromPod(f, cmd, cmderr, srcSpec, destSpec)
+		return o.copyFromPod(srcSpec, destSpec)
 	}
 	if len(destSpec.PodName) != 0 {
-		return copyToPod(f, cmd, out, cmderr, srcSpec, destSpec)
+		return o.copyToPod(srcSpec, destSpec)
 	}
-	return cmdutil.UsageErrorf(cmd, "One of src or dest must be a remote file specification")
+	return fmt.Errorf("One of src or dest must be a remote file specification")
 }
 
 // checkDestinationIsDir receives a destination fileSpec and
 // determines if the provided destination path exists on the
 // pod. If the destination path does not exist or is _not_ a
 // directory, an error is returned with the exit code received.
-func checkDestinationIsDir(dest fileSpec, f cmdutil.Factory, cmd *cobra.Command) error {
+func (o *CopyOptions) checkDestinationIsDir(dest fileSpec) error {
 	options := &ExecOptions{
 		StreamOptions: StreamOptions{
 			Out: bytes.NewBuffer([]byte{}),
@@ -158,10 +205,10 @@ func checkDestinationIsDir(dest fileSpec, f cmdutil.Factory, cmd *cobra.Command)
 		Executor: &DefaultRemoteExecutor{},
 	}
 
-	return execute(f, cmd, options)
+	return o.execute(options)
 }
 
-func copyToPod(f cmdutil.Factory, cmd *cobra.Command, stdout, stderr io.Writer, src, dest fileSpec) error {
+func (o *CopyOptions) copyToPod(src, dest fileSpec) error {
 	if len(src.File) == 0 || len(dest.File) == 0 {
 		return errFileCannotBeEmpty
 	}
@@ -172,7 +219,7 @@ func copyToPod(f cmdutil.Factory, cmd *cobra.Command, stdout, stderr io.Writer,
 		dest.File = dest.File[:len(dest.File)-1]
 	}
 
-	if err := checkDestinationIsDir(dest, f, cmd); err == nil {
+	if err := o.checkDestinationIsDir(dest); err == nil {
 		// If no error, dest.File was found to be a directory.
 		// Copy specified src into it
 		dest.File = dest.File + "/" + path.Base(src.File)
@@ -194,8 +241,8 @@ func copyToPod(f cmdutil.Factory, cmd *cobra.Command, stdout, stderr io.Writer,
 	options := &ExecOptions{
 		StreamOptions: StreamOptions{
 			In:    reader,
-			Out:   stdout,
-			Err:   stderr,
+			Out:   o.Out,
+			Err:   o.ErrOut,
 			Stdin: true,
 
 			Namespace: dest.PodNamespace,
@@ -205,10 +252,10 @@ func copyToPod(f cmdutil.Factory, cmd *cobra.Command, stdout, stderr io.Writer,
 		Command:  cmdArr,
 		Executor: &DefaultRemoteExecutor{},
 	}
-	return execute(f, cmd, options)
+	return o.execute(options)
 }
 
-func copyFromPod(f cmdutil.Factory, cmd *cobra.Command, cmderr io.Writer, src, dest fileSpec) error {
+func (o *CopyOptions) copyFromPod(src, dest fileSpec) error {
 	if len(src.File) == 0 || len(dest.File) == 0 {
 		return errFileCannotBeEmpty
 	}
@@ -218,7 +265,7 @@ func copyFromPod(f cmdutil.Factory, cmd *cobra.Command, cmderr io.Writer, src, d
 		StreamOptions: StreamOptions{
 			In:  nil,
 			Out: outStream,
-			Err: cmderr,
+			Err: o.Out,
 
 			Namespace: src.PodNamespace,
 			PodName:   src.PodName,
@@ -231,7 +278,7 @@ func copyFromPod(f cmdutil.Factory, cmd *cobra.Command, cmderr io.Writer, src, d
 
 	go func() {
 		defer outStream.Close()
-		execute(f, cmd, options)
+		o.execute(options)
 	}()
 	prefix := getPrefix(src.File)
 	prefix = path.Clean(prefix)
@@ -389,31 +436,17 @@ func getPrefix(file string) string {
 	return strings.TrimLeft(file, "/")
 }
 
-func execute(f cmdutil.Factory, cmd *cobra.Command, options *ExecOptions) error {
+func (o *CopyOptions) execute(options *ExecOptions) error {
 	if len(options.Namespace) == 0 {
-		namespace, _, err := f.DefaultNamespace()
-		if err != nil {
-			return err
-		}
-		options.Namespace = namespace
+		options.Namespace = o.Namespace
 	}
 
-	container := cmdutil.GetFlagString(cmd, "container")
-	if len(container) > 0 {
-		options.ContainerName = container
+	if len(o.Container) > 0 {
+		options.ContainerName = o.Container
 	}
 
-	config, err := f.ClientConfig()
-	if err != nil {
-		return err
-	}
-	options.Config = config
-
-	clientset, err := f.ClientSet()
-	if err != nil {
-		return err
-	}
-	options.PodClient = clientset.Core()
+	options.Config = o.ClientConfig
+	options.PodClient = o.Clientset.Core()
 
 	if err := options.Validate(); err != nil {
 		return err