From 58ae413bca487c7fa4150c7ff9dd59321f087106 Mon Sep 17 00:00:00 2001
From: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
Date: Thu, 2 Aug 2018 10:55:15 -0400
Subject: [PATCH] Do not add a newline between a stream of info messages.  The
 contract is that these will just be appended continguously. (#1688)

---
 pkg/backend/local/progress.go | 6 +-----
 pkg/resource/plugin/plugin.go | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkg/backend/local/progress.go b/pkg/backend/local/progress.go
index 49410d60b..84655dc70 100644
--- a/pkg/backend/local/progress.go
+++ b/pkg/backend/local/progress.go
@@ -734,11 +734,7 @@ func (display *ProgressDisplay) mergeStreamPayloadsToSinglePayload(
 	payloads []engine.DiagEventPayload) engine.DiagEventPayload {
 	buf := bytes.Buffer{}
 
-	for i, p := range payloads {
-		if i != 0 {
-			buf.WriteString("\n")
-		}
-
+	for _, p := range payloads {
 		buf.WriteString(display.renderProgressDiagEvent(p, false /*includePrefix:*/))
 	}
 
diff --git a/pkg/resource/plugin/plugin.go b/pkg/resource/plugin/plugin.go
index 83566d824..37a64379c 100644
--- a/pkg/resource/plugin/plugin.go
+++ b/pkg/resource/plugin/plugin.go
@@ -24,7 +24,6 @@ import (
 	"strings"
 	"sync/atomic"
 	"time"
-	"unicode"
 
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
@@ -120,7 +119,6 @@ func newPlugin(ctx *Context, bin string, prefix string, args []string) (*plugin,
 				break
 			}
 
-			msg = strings.TrimRightFunc(msg, unicode.IsSpace)
 			if strings.TrimSpace(msg) != "" {
 				if stderr {
 					ctx.Diag.Infoerrf(diag.StreamMessage("" /*urn*/, msg, errStreamID))