From e4f1f63503fd2b9a206cf3030423199abc3dfb91 Mon Sep 17 00:00:00 2001 From: Ross Henderson <105660552+rhbuf@users.noreply.github.com> Date: Fri, 30 Dec 2022 09:59:22 +0000 Subject: [PATCH] fix: logs error shadowing exec error (#1172) fixes https://github.com/k3d-io/k3d/issues/1171 --- pkg/runtimes/docker/node.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/runtimes/docker/node.go b/pkg/runtimes/docker/node.go index 5ea6d05d..03054acc 100644 --- a/pkg/runtimes/docker/node.go +++ b/pkg/runtimes/docker/node.go @@ -352,9 +352,9 @@ func execInNode(ctx context.Context, node *k3d.Node, cmd []string, stdin io.Read } if err != nil { if execConnection != nil && execConnection.Reader != nil { - logs, err := io.ReadAll(execConnection.Reader) - if err != nil { - return fmt.Errorf("failed to get logs from errored exec process in node '%s': %w", node.Name, err) + logs, logsErr := io.ReadAll(execConnection.Reader) + if logsErr != nil { + return fmt.Errorf("failed to get logs from errored exec process in node '%s': %w", node.Name, logsErr) } err = fmt.Errorf("%w: Logs from failed access process:\n%s", err, string(logs)) }