From 6caf4d5a3fed5e818e389c6c72a00de207c40517 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 13 Aug 2016 19:07:28 -0400 Subject: [PATCH] Describing a single item should not have extra newlines --- pkg/kubectl/cmd/describe.go | 8 +++++++- pkg/kubectl/cmd/describe_test.go | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/describe.go b/pkg/kubectl/cmd/describe.go index 130dc51c293..9bbb7d7aeff 100644 --- a/pkg/kubectl/cmd/describe.go +++ b/pkg/kubectl/cmd/describe.go @@ -142,6 +142,7 @@ func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s allErrs = append(allErrs, err) } + first := true for _, info := range infos { mapping := info.ResourceMapping() describer, err := f.Describer(mapping) @@ -154,7 +155,12 @@ func RunDescribe(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []s allErrs = append(allErrs, err) continue } - fmt.Fprintf(out, "%s\n\n", s) + if first { + first = false + fmt.Fprint(out, s) + } else { + fmt.Fprintf(out, "\n\n%s", s) + } } return utilerrors.NewAggregate(allErrs) diff --git a/pkg/kubectl/cmd/describe_test.go b/pkg/kubectl/cmd/describe_test.go index db896c3a0dd..7ee1a695618 100644 --- a/pkg/kubectl/cmd/describe_test.go +++ b/pkg/kubectl/cmd/describe_test.go @@ -44,7 +44,7 @@ func TestDescribeUnknownSchemaObject(t *testing.T) { t.Errorf("unexpected describer: %#v", d) } - if buf.String() != fmt.Sprintf("%s\n\n", d.Output) { + if buf.String() != fmt.Sprintf("%s", d.Output) { t.Errorf("unexpected output: %s", buf.String()) } } @@ -77,7 +77,7 @@ func TestDescribeObject(t *testing.T) { t.Errorf("unexpected describer: %#v", d) } - if buf.String() != fmt.Sprintf("%s\n\n", d.Output) { + if buf.String() != fmt.Sprintf("%s", d.Output) { t.Errorf("unexpected output: %s", buf.String()) } } @@ -96,7 +96,7 @@ func TestDescribeListObjects(t *testing.T) { buf := bytes.NewBuffer([]byte{}) cmd := NewCmdDescribe(f, buf) cmd.Run(cmd, []string{"pods"}) - if buf.String() != fmt.Sprintf("%s\n\n%s\n\n", d.Output, d.Output) { + if buf.String() != fmt.Sprintf("%s\n\n%s", d.Output, d.Output) { t.Errorf("unexpected output: %s", buf.String()) } }