SOLTYSH: oc printing

Author: deads2k

pkg/bulk/cmd.go

@@ -232,42 +232,46 @@ func PreferredSerializationOrder(client discovery.DiscoveryInterface) []schema.G
 	return ret
 }
 
-func NewPrintNameOrErrorAfterIndent(mapper meta.RESTMapper, short bool, operation string, out, errs io.Writer, dryRun bool, indent string, prefixForError PrefixForError) AfterFunc {
+func NewPrintNameOrErrorAfterIndent(short bool, operation string, out, errs io.Writer, dryRun bool, indent string, prefixForError PrefixForError) AfterFunc {
 	return func(info *resource.Info, err error) bool {
 		if err == nil {
 			fmt.Fprintf(out, indent)
-			printSuccess(mapper, short, out, info.Mapping.Resource, info.Name, dryRun, operation)
+			printSuccess(short, out, info.Mapping.GroupVersionKind, info.Name, dryRun, operation)
 		} else {
 			fmt.Fprintf(errs, "%s%s: %v\n", indent, prefixForError(err), err)
 		}
 		return false
 	}
 }
 
-func printSuccess(mapper meta.RESTMapper, shortOutput bool, out io.Writer, resource, name string, dryRun bool, operation string) {
-	resource, _ = mapper.ResourceSingularizer(resource)
+func printSuccess(shortOutput bool, out io.Writer, gvk schema.GroupVersionKind, name string, dryRun bool, operation string) {
+	kindString := gvk.Kind
+	if len(gvk.Group) > 0 {
+		kindString = gvk.Kind + "." + gvk.Group
+	}
+
 	dryRunMsg := ""
 	if dryRun {
 		dryRunMsg = " (dry run)"
 	}
 	if shortOutput {
 		// -o name: prints resource/name
-		if len(resource) > 0 {
-			fmt.Fprintf(out, "%s/%s\n", resource, name)
+		if len(kindString) > 0 {
+			fmt.Fprintf(out, "%s/%s\n", kindString, name)
 		} else {
 			fmt.Fprintf(out, "%s\n", name)
 		}
 	} else {
 		// understandable output by default
-		if len(resource) > 0 {
-			fmt.Fprintf(out, "%s \"%s\" %s%s\n", resource, name, operation, dryRunMsg)
+		if len(kindString) > 0 {
+			fmt.Fprintf(out, "%s \"%s\" %s%s\n", kindString, name, operation, dryRunMsg)
 		} else {
 			fmt.Fprintf(out, "\"%s\" %s%s\n", name, operation, dryRunMsg)
 		}
 	}
 }
 
-func NewPrintErrorAfter(mapper meta.RESTMapper, errs io.Writer, prefixForError PrefixForError) func(*resource.Info, error) bool {
+func NewPrintErrorAfter(errs io.Writer, prefixForError PrefixForError) func(*resource.Info, error) bool {
 	return func(info *resource.Info, err error) bool {
 		if err != nil {
 			fmt.Fprintf(errs, "%s: %v\n", prefixForError(err), err)
@@ -390,12 +394,12 @@ func (b BulkAction) WithMessageAndPrefix(action, individual string, prefixForErr
 	switch {
 	// TODO: this should be b printer
 	case b.Output == "":
-		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, false, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent(), prefixForError)
+		b.Bulk.After = NewPrintNameOrErrorAfterIndent(false, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent(), prefixForError)
 	// TODO: needs to be unified with the name printer (incremental vs exact execution), possibly by creating b synthetic printer?
 	case b.Output == "name":
-		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, true, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent(), prefixForError)
+		b.Bulk.After = NewPrintNameOrErrorAfterIndent(true, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent(), prefixForError)
 	default:
-		b.Bulk.After = NewPrintErrorAfter(b.Bulk.Mapper, b.ErrOut, prefixForError)
+		b.Bulk.After = NewPrintErrorAfter(b.ErrOut, prefixForError)
 		if b.StopOnError {
 			b.Bulk.After = HaltOnError(b.Bulk.After)
 		}

pkg/cmd/server/admin/create_bootstrappolicy_file.go

@@ -15,16 +15,15 @@ import (
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	kprinters "k8s.io/kubernetes/pkg/printers"
+	"k8s.io/kubernetes/pkg/kubectl/genericclioptions/printers"
 
 	"github.com/openshift/origin/pkg/api/latest"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 )
 
 const (
-	DefaultPolicyFile                    = "openshift.local.config/master/policy.json"
-	CreateBootstrapPolicyFileCommand     = "create-bootstrap-policy-file"
-	CreateBootstrapPolicyFileFullCommand = "oc adm " + CreateBootstrapPolicyFileCommand
+	DefaultPolicyFile                = "openshift.local.config/master/policy.json"
+	CreateBootstrapPolicyFileCommand = "create-bootstrap-policy-file"
 )
 
 type CreateBootstrapPolicyFileOptions struct {
@@ -123,7 +122,7 @@ func (o CreateBootstrapPolicyFileOptions) CreateBootstrapPolicyFile() error {
 	}
 
 	buffer := &bytes.Buffer{}
-	(&kprinters.JSONPrinter{}).PrintObj(versionedPolicyList, buffer)
+	(&printers.JSONPrinter{}).PrintObj(versionedPolicyList, buffer)
 
 	if err := ioutil.WriteFile(o.File, buffer.Bytes(), 0644); err != nil {
 		return err

pkg/cmd/util/print/print.go

@@ -7,6 +7,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 // VersionedPrintObject handles printing an object in the appropriate version by looking at 'output-version'
@@ -16,19 +17,15 @@ func VersionedPrintObject(scheme *runtime.Scheme, fn func(*cobra.Command, runtim
 		// TODO: fold into the core printer functionality (preferred output version)
 
 		if items, err := meta.ExtractList(obj); err == nil {
-			items, err = convertItemsForDisplayFromDefaultCommand(scheme, c, items)
-			if err != nil {
-				return err
+			for i := range items {
+				items[i] = kcmdutil.AsDefaultVersionedOrOriginal(items[i], nil)
 			}
 			if err := meta.SetList(obj, items); err != nil {
 				return err
 			}
+
 		} else {
-			result, err := convertItemsForDisplayFromDefaultCommand(scheme, c, []runtime.Object{obj})
-			if err != nil {
-				return err
-			}
-			obj = result[0]
+			obj = kcmdutil.AsDefaultVersionedOrOriginal(obj, nil)
 		}
 		return fn(c, obj, out)
 	}