controller: strip newlines from Helm error message

hiddeco · hiddeco · commit 5d0c9740d14f · 2023-09-11T13:47:53.000+02:00
To prevent spurious newlines between the error message and the captured
logs, as at times Helm ends error with one or multiple newlines.

Signed-off-by: Hidde Beydals &lt;hidde@hhh.computer&gt;
diff --git a/internal/controller/helmrelease_controller.go b/internal/controller/helmrelease_controller.go
@@ -715,7 +715,7 @@ func (r *HelmReleaseReconciler) handleHelmActionResult(ctx context.Context,
 		err = fmt.Errorf("Helm %s failed: %w", action, err)
 		msg := err.Error()
 		if actionErr := (*runner.ActionError)(nil); errors.As(err, &actionErr) {
-			msg = msg + "\n\nLast Helm logs:\n\n" + actionErr.CapturedLogs
+			msg = strings.TrimSpace(msg) + "\n\nLast Helm logs:\n\n" + actionErr.CapturedLogs
 		}
 		newCondition := metav1.Condition{
 			Type:    condition,

Original file line number	Diff line number	Diff line change
`@@ -715,7 +715,7 @@ func (r *HelmReleaseReconciler) handleHelmActionResult(ctx context.Context,`
`715`	`715`	`err = fmt.Errorf("Helm %s failed: %w", action, err)`
`716`	`716`	`msg := err.Error()`
`717`	`717`	`if actionErr := (*runner.ActionError)(nil); errors.As(err, &actionErr) {`
`718`		`- msg = msg + "\n\nLast Helm logs:\n\n" + actionErr.CapturedLogs`
	`718`	`+ msg = strings.TrimSpace(msg) + "\n\nLast Helm logs:\n\n" + actionErr.CapturedLogs`
`719`	`719`	`}`
`720`	`720`	`newCondition := metav1.Condition{`
`721`	`721`	`Type: condition,`