From c291d3d7ed224d2e1780fab6f36b2d9d2310a2a5 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Fri, 14 Sep 2018 00:12:06 -0400
Subject: [PATCH] Consistently print errors to stderr and add newlines to
 cordon

---
 pkg/kubectl/cmd/drain/drain.go      | 18 +++++++++---------
 pkg/kubectl/cmd/drain/drain_test.go |  7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkg/kubectl/cmd/drain/drain.go b/pkg/kubectl/cmd/drain/drain.go
index 187b73c1dd..86c8e36f08 100644
--- a/pkg/kubectl/cmd/drain/drain.go
+++ b/pkg/kubectl/cmd/drain/drain.go
@@ -728,24 +728,24 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
 		if nodeInfo.Mapping.GroupVersionKind.Kind == "Node" {
 			obj, err := scheme.Scheme.ConvertToVersion(nodeInfo.Object, nodeInfo.Mapping.GroupVersionKind.GroupVersion())
 			if err != nil {
-				fmt.Printf("error: unable to %s node %q: %v", cordonOrUncordon, nodeInfo.Name, err)
+				fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: %v\n", cordonOrUncordon, nodeInfo.Name, err)
 				continue
 			}
 			oldData, err := json.Marshal(obj)
 			if err != nil {
-				fmt.Printf("error: unable to %s node %q: %v", cordonOrUncordon, nodeInfo.Name, err)
+				fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: %v\n", cordonOrUncordon, nodeInfo.Name, err)
 				continue
 			}
 			node, ok := obj.(*corev1.Node)
 			if !ok {
-				fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: unexpected Type%T, expected Node", cordonOrUncordon, nodeInfo.Name, obj)
+				fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: unexpected Type%T, expected Node\n", cordonOrUncordon, nodeInfo.Name, obj)
 				continue
 			}
 			unsched := node.Spec.Unschedulable
 			if unsched == desired {
 				printObj, err := o.ToPrinter(already(desired))
 				if err != nil {
-					fmt.Printf("error: %v", err)
+					fmt.Fprintf(o.ErrOut, "error: %v\n", err)
 					continue
 				}
 				printObj(cmdutil.AsDefaultVersionedOrOriginal(nodeInfo.Object, nodeInfo.Mapping), o.Out)
@@ -755,23 +755,23 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
 					node.Spec.Unschedulable = desired
 					newData, err := json.Marshal(obj)
 					if err != nil {
-						fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: %v", cordonOrUncordon, nodeInfo.Name, err)
+						fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: %v\n", cordonOrUncordon, nodeInfo.Name, err)
 						continue
 					}
 					patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj)
 					if err != nil {
-						fmt.Printf("error: unable to %s node %q: %v", cordonOrUncordon, nodeInfo.Name, err)
+						fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: %v\n", cordonOrUncordon, nodeInfo.Name, err)
 						continue
 					}
 					_, err = helper.Patch(o.Namespace, nodeInfo.Name, types.StrategicMergePatchType, patchBytes, nil)
 					if err != nil {
-						fmt.Printf("error: unable to %s node %q: %v", cordonOrUncordon, nodeInfo.Name, err)
+						fmt.Fprintf(o.ErrOut, "error: unable to %s node %q: %v\n", cordonOrUncordon, nodeInfo.Name, err)
 						continue
 					}
 				}
 				printObj, err := o.ToPrinter(changed(desired))
 				if err != nil {
-					fmt.Fprintf(o.ErrOut, "%v", err)
+					fmt.Fprintf(o.ErrOut, "%v\n", err)
 					continue
 				}
 				printObj(cmdutil.AsDefaultVersionedOrOriginal(nodeInfo.Object, nodeInfo.Mapping), o.Out)
@@ -779,7 +779,7 @@ func (o *DrainOptions) RunCordonOrUncordon(desired bool) error {
 		} else {
 			printObj, err := o.ToPrinter("skipped")
 			if err != nil {
-				fmt.Fprintf(o.ErrOut, "%v", err)
+				fmt.Fprintf(o.ErrOut, "%v\n", err)
 				continue
 			}
 			printObj(cmdutil.AsDefaultVersionedOrOriginal(nodeInfo.Object, nodeInfo.Mapping), o.Out)
diff --git a/pkg/kubectl/cmd/drain/drain_test.go b/pkg/kubectl/cmd/drain/drain_test.go
index abde5ae79f..bd2eebb48b 100644
--- a/pkg/kubectl/cmd/drain/drain_test.go
+++ b/pkg/kubectl/cmd/drain/drain_test.go
@@ -595,7 +595,7 @@ func TestDrain(t *testing.T) {
 			pods:          []corev1.Pod{ds_pod_with_emptyDir},
 			rcs:           []corev1.ReplicationController{rc},
 			args:          []string{"node", "--ignore-daemonsets"},
-			expectWarning: "WARNING: Ignoring DaemonSet-managed pods: bar\n",
+			expectWarning: "WARNING: Ignoring DaemonSet-managed pods: bar",
 			expectFatal:   false,
 			expectDelete:  false,
 		},
@@ -855,8 +855,9 @@ func TestDrain(t *testing.T) {
 						t.Fatalf("%s: expected warning, but found no stderr output", test.description)
 					}
 
-					if errBuf.String() != test.expectWarning {
-						t.Fatalf("%s: actual warning message did not match expected warning message.\n Expecting: %s\n  Got: %s", test.description, test.expectWarning, errBuf.String())
+					// Mac and Bazel on Linux behave differently when returning newlines
+					if a, e := errBuf.String(), test.expectWarning; !strings.Contains(a, e) {
+						t.Fatalf("%s: actual warning message did not match expected warning message.\n Expecting:\n%v\n  Got:\n%v", test.description, e, a)
 					}
 				}
 			})