wire printflags through additional cmds

pkg/kubectl/cmd/convert.go

@@ -18,7 +18,6 @@ package cmd
 
 import (
 	"fmt"
-	"io"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -27,6 +26,7 @@ import (
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"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/resource"
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
 	"k8s.io/kubernetes/pkg/printers"
@@ -61,8 +61,8 @@ var (
 
 // NewCmdConvert creates a command object for the generic "convert" action, which
 // translates the config file into a given version.
-func NewCmdConvert(f cmdutil.Factory, out io.Writer) *cobra.Command {
-	options := NewConvertOptions()
+func NewCmdConvert(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command {
+	options := NewConvertOptions(ioStreams)
 
 	cmd := &cobra.Command{
 		Use: "convert -f FILENAME",
@@ -71,18 +71,17 @@ func NewCmdConvert(f cmdutil.Factory, out io.Writer) *cobra.Command {
 		Long:    convert_long,
 		Example: convert_example,
 		Run: func(cmd *cobra.Command, args []string) {
-			err := options.Complete(f, out, cmd)
-			cmdutil.CheckErr(err)
-			err = options.RunConvert()
-			cmdutil.CheckErr(err)
+			cmdutil.CheckErr(options.Complete(f, cmd))
+			cmdutil.CheckErr(options.RunConvert())
 		},
 	}
 
+	options.PrintFlags.AddFlags(cmd)
+
 	usage := "to need to get converted."
 	cmdutil.AddFilenameOptionFlags(cmd, &options.FilenameOptions, usage)
 	cmd.MarkFlagRequired("filename")
 	cmdutil.AddValidateFlags(cmd)
-	cmdutil.AddNonDeprecatedPrinterFlags(cmd)
 	cmd.Flags().BoolVar(&options.local, "local", options.local, "If true, convert will NOT try to contact api-server but run locally.")
 	cmd.Flags().String("output-version", "", i18n.T("Output the formatted object with the given group version (for ex: 'extensions/v1beta1').)"))
 	return cmd
@@ -90,19 +89,24 @@ func NewCmdConvert(f cmdutil.Factory, out io.Writer) *cobra.Command {
 
 // ConvertOptions have the data required to perform the convert operation
 type ConvertOptions struct {
+	PrintFlags *printers.PrintFlags
+	PrintObj   printers.ResourcePrinterFunc
+
 	resource.FilenameOptions
 
 	builder *resource.Builder
 	local   bool
 
-	out     io.Writer
-	printer printers.ResourcePrinter
-
+	genericclioptions.IOStreams
 	specifiedOutputVersion schema.GroupVersion
 }
 
-func NewConvertOptions() *ConvertOptions {
-	return &ConvertOptions{local: true}
+func NewConvertOptions(ioStreams genericclioptions.IOStreams) *ConvertOptions {
+	return &ConvertOptions{
+		PrintFlags: printers.NewPrintFlags("converted").WithDefaultOutput("yaml"),
+		local:      true,
+		IOStreams:  ioStreams,
+	}
 }
 
 // outputVersion returns the preferred output version for generic content (JSON, YAML, or templates)
@@ -117,7 +121,7 @@ func outputVersion(cmd *cobra.Command) (schema.GroupVersion, error) {
 }
 
 // Complete collects information required to run Convert command from command line.
-func (o *ConvertOptions) Complete(f cmdutil.Factory, out io.Writer, cmd *cobra.Command) (err error) {
+func (o *ConvertOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) (err error) {
 	o.specifiedOutputVersion, err = outputVersion(cmd)
 	if err != nil {
 		return err
@@ -145,20 +149,12 @@ func (o *ConvertOptions) Complete(f cmdutil.Factory, out io.Writer, cmd *cobra.C
 		Flatten()
 
 	// build the printer
-	o.out = out
-	outputFormat := cmdutil.GetFlagString(cmd, "output")
-	templateFile := cmdutil.GetFlagString(cmd, "template")
-	if len(outputFormat) == 0 {
-		if len(templateFile) == 0 {
-			outputFormat = "yaml"
-		} else {
-			outputFormat = "template"
-		}
-		// TODO: once printing is abstracted, this should be handled at flag declaration time
-		cmd.Flags().Set("output", outputFormat)
+	printer, err := o.PrintFlags.ToPrinter()
+	if err != nil {
+		return err
 	}
-	o.printer, err = cmdutil.PrinterForOptions(cmdutil.ExtractCmdPrintOptions(cmd, false))
-	return err
+	o.PrintObj = printer.PrintObj
+	return nil
 }
 
 // RunConvert implements the generic Convert command
@@ -189,10 +185,10 @@ func (o *ConvertOptions) RunConvert() error {
 		if err != nil {
 			return err
 		}
-		return o.printer.PrintObj(obj, o.out)
+		return o.PrintObj(obj, o.Out)
 	}
 
-	return o.printer.PrintObj(objects, o.out)
+	return o.PrintObj(objects, o.Out)
 }
 
 // objectListToVersionedObject receives a list of api objects and a group version