fix: not print error message if it is empty (#8005)

GoogleContainerTools · Nov 2, 2022 · 6db39da · 6db39da
1 parent aed03c5
commit 6db39da
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/pkg/skaffold/render/renderer/helm/helm.go b/pkg/skaffold/render/renderer/helm/helm.go
@@ -148,10 +148,18 @@ func (h Helm) generateHelmManifests(ctx context.Context, builds []graph.Artifact
 
 		outBuffer := new(bytes.Buffer)
 		errBuffer := new(bytes.Buffer)
-		if err := helm.ExecWithStdoutAndStderr(ctx, h, outBuffer, errBuffer, false, helmEnv, args...); err != nil {
-			return nil, helm.UserErr("std out err", fmt.Errorf(outBuffer.String(), fmt.Errorf(errBuffer.String())))
+
+		err = helm.ExecWithStdoutAndStderr(ctx, h, outBuffer, errBuffer, false, helmEnv, args...)
+		errorMsg := errBuffer.String()
+
+		if len(errorMsg) > 0 {
+			log.Entry(ctx).Errorf(errorMsg)
+		}
+
+		if err != nil {
+			return nil, helm.UserErr("std out err", fmt.Errorf(outBuffer.String(), fmt.Errorf(errorMsg)))
 		}
-		log.Entry(ctx).Errorf(errBuffer.String())
+
 		renderedManifests.Append(outBuffer.Bytes())
 	}