Merge pull request #13540 from gabemontero/13492

OpenShift Bot · web-flow · commit 959be879a940 · 2017-03-27T14:39:48.000-05:00
Merged by openshift-bot
diff --git a/pkg/generate/app/cmd/template.go b/pkg/generate/app/cmd/template.go
@@ -50,7 +50,7 @@ func TransformTemplate(tpl *templateapi.Template, client client.TemplateConfigsN
 }
 
 func formatString(out io.Writer, tab, s string) {
-	labelVals := strings.Split(s, "\n")
+	labelVals := strings.Split(strings.TrimSuffix(s, "\n"), "\n")
 
 	for _, lval := range labelVals {
 		fmt.Fprintf(out, fmt.Sprintf("%s%s\n", tab, lval))
@@ -83,7 +83,6 @@ func DescribeGeneratedTemplate(out io.Writer, input string, result *templateapi.
 			formatString(out, "     ", message)
 			fmt.Fprintln(out)
 		}
-		fmt.Fprintln(out)
 	}
 
 	if warnings := result.Annotations[app.GenerationWarningAnnotation]; len(warnings) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func TransformTemplate(tpl *templateapi.Template, client client.TemplateConfigsN`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func formatString(out io.Writer, tab, s string) {`
`53`		`- labelVals := strings.Split(s, "\n")`
	`53`	`+ labelVals := strings.Split(strings.TrimSuffix(s, "\n"), "\n")`
`54`	`54`
`55`	`55`	`for _, lval := range labelVals {`
`56`	`56`	`fmt.Fprintf(out, fmt.Sprintf("%s%s\n", tab, lval))`
`@@ -83,7 +83,6 @@ func DescribeGeneratedTemplate(out io.Writer, input string, result *templateapi.`
`83`	`83`	`formatString(out, " ", message)`
`84`	`84`	`fmt.Fprintln(out)`
`85`	`85`	`}`
`86`		`- fmt.Fprintln(out)`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`if warnings := result.Annotations[app.GenerationWarningAnnotation]; len(warnings) > 0 {`