From f7f9dd05564d1490ac8dc9fdbf527c0e1af4f35c Mon Sep 17 00:00:00 2001
From: Shivam Bharuka <sbharuka@amazon.com>
Date: Tue, 14 Nov 2017 16:54:40 -0800
Subject: [PATCH] Fix CloudWatch issue and Spacing in Output

---
 .../processor/executer/iohandler/iomodule/commandoutput.go | 5 +----
 agent/framework/runpluginutil/runpluginutil.go             | 7 +++++--
 agent/longrunning/manager/invoke.go                        | 2 +-
 agent/plugins/lrpminvoker/invoker.go                       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/agent/framework/processor/executer/iohandler/iomodule/commandoutput.go b/agent/framework/processor/executer/iohandler/iomodule/commandoutput.go
index 1e0ce3467..5e289c748 100644
--- a/agent/framework/processor/executer/iohandler/iomodule/commandoutput.go
+++ b/agent/framework/processor/executer/iohandler/iomodule/commandoutput.go
@@ -15,7 +15,6 @@ package iomodule
 
 import (
 	"bufio"
-	"bytes"
 	"fmt"
 	"io"
 
@@ -38,17 +37,15 @@ func (c CommandOutput) Read(log log.T, reader *io.PipeReader) {
 	scanner.Split(bufio.ScanBytes)
 
 	outputLimit := 0
-	var buffer bytes.Buffer
 	for scanner.Scan() {
 		// Check if size of output is greater than the output limit
 		outputLimit++
 		if outputLimit > c.OutputLimit {
 			break
 		}
-		buffer.WriteString(scanner.Text())
+		*c.OutputString = fmt.Sprintf("%v%v", *c.OutputString, scanner.Text())
 	}
 	log.Debugf("Number of bytes written to console output: %v", outputLimit)
-	*c.OutputString = fmt.Sprintf("%v%v", *c.OutputString, buffer.String())
 
 	if err := scanner.Err(); err != nil {
 		log.Error("Error with the scanner while reading the stream")
diff --git a/agent/framework/runpluginutil/runpluginutil.go b/agent/framework/runpluginutil/runpluginutil.go
index e99ac45fb..f1d283d2d 100644
--- a/agent/framework/runpluginutil/runpluginutil.go
+++ b/agent/framework/runpluginutil/runpluginutil.go
@@ -249,7 +249,6 @@ func runPlugin(
 	default:
 		executePlugin(context, p, pluginName, config, cancelFlag, output)
 	}
-
 	pluginConfig := iohandler.DefaultOutputConfig()
 
 	res.Code = output.GetExitCode()
@@ -271,7 +270,11 @@ func executePlugin(context context.T,
 	var propID string
 	var err error
 	if config.PluginName == config.PluginID {
-		propID, err = GetPropertyName(config.Properties) //V10 Schema
+		if pluginName == appconfig.PluginNameCloudWatch {
+			propID = appconfig.PluginNameCloudWatch
+		} else {
+			propID, err = GetPropertyName(config.Properties) //V10 Schema
+		}
 	} else {
 		propID = config.PluginID //V20 Schema
 	}
diff --git a/agent/longrunning/manager/invoke.go b/agent/longrunning/manager/invoke.go
index 2b2930405..1737cfd14 100644
--- a/agent/longrunning/manager/invoke.go
+++ b/agent/longrunning/manager/invoke.go
@@ -67,7 +67,7 @@ func Invoke(log logger.T, pluginID string, res *contracts.PluginResult, orchestr
 		}
 
 	default:
-		log.Errorf("Allowed Values of StartType: Enabled | Disabled")
+		log.Errorf("Allowed Values of StartType: Enabled | Disabled but provided value is: %s", startType)
 		CreateResult("Allowed Values of StartType: Enabled | Disabled",
 			contracts.ResultStatusFailed, res)
 	}
diff --git a/agent/plugins/lrpminvoker/invoker.go b/agent/plugins/lrpminvoker/invoker.go
index f4820d70e..c5c349f86 100644
--- a/agent/plugins/lrpminvoker/invoker.go
+++ b/agent/plugins/lrpminvoker/invoker.go
@@ -90,7 +90,7 @@ func (p *Plugin) Execute(context context.T, config contracts.Configuration, canc
 	} else {
 		property := p.prepareForStart(log, config, cancelFlag, output)
 		output.SetOutput(property)
-		output.SetStdout(setting.StartType)
+		output.AppendInfo(setting.StartType)
 	}
 
 	return