Skip to content

Commit

Permalink
fix: Always outputs stdout for running, non-interactive, shells (#427)
Browse files Browse the repository at this point in the history
* Always outputs stdout for running, non-interactive, shells

* outputs all stream info to stderr on error, captures stderr from session

* Changes write strategy for non-interactive session

---------

Co-authored-by: Blaize Kaye <[email protected]>
  • Loading branch information
bomoko and Blaize Kaye authored Feb 17, 2025
1 parent 5320d38 commit 2221499
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions pkg/lagoon/ssh/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,17 @@ func RunSSHCommand(lagoon map[string]string, sshService string, sshContainer str
}
var b bytes.Buffer
session.Stdout = &b

var e bytes.Buffer
session.Stderr = &e
err = session.Run(connString + " " + command)

if err != nil {
os.Stderr.WriteString(b.String())
os.Stderr.WriteString(e.String())
return err
}
fmt.Println(b.String())
os.Stdout.WriteString(b.String())
os.Stderr.WriteString(e.String())
return nil
}

Expand Down

0 comments on commit 2221499

Please sign in to comment.