Skip to content

Consider os.Stdout when determining terminal size during container exec #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenasB merged 1 commit into from
Jul 10, 2025
Merged

Consider os.Stdout when determining terminal size during container exec #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions internal/cli/container/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,22 +116,25 @@ func Create(client pb.ContainerServiceClient, yamlBytes []byte) error {
}

func Exec(client pb.ContainerServiceClient, id uint32, args []string) error {
termFd := int(os.Stdin.Fd())
inputFd := int(os.Stdin.Fd())

if !term.IsTerminal(termFd) {
if !term.IsTerminal(inputFd) {
return fmt.Errorf("standard input must be a terminal for container exec")
}

oldState, err := term.MakeRaw(termFd)
oldState, err := term.MakeRaw(inputFd)
if err != nil {
return fmt.Errorf("failed to put the terminal into a raw mode: %w", err)
return fmt.Errorf("failed to put the terminal into raw mode: %w", err)
}
defer term.Restore(termFd, oldState)
defer term.Restore(inputFd, oldState)

// TODO: #9 container exec not working on Windows Git Bash and Powershell
width, height, err := term.GetSize(termFd)
output := os.Stdout
width, height, err := term.GetSize(inputFd)
if err != nil {
return fmt.Errorf("failed to retrieve the size of the terminal: %w", err)
width, height, err = term.GetSize(int(output.Fd()))
if err != nil {
return fmt.Errorf("failed to retrieve the size of the terminal: %w", err)
}
}

stream, err := client.Exec(context.Background())
Expand Down Expand Up @@ -187,13 +190,13 @@ func Exec(client pb.ContainerServiceClient, id uint32, args []string) error {
}
switch p := resp.Output.(type) {
case *pb.ContainerExecResponse_Stdout:
os.Stdout.Write(p.Stdout)
output.Write(p.Stdout)
case *pb.ContainerExecResponse_ExitCode:
exitCode = int(p.ExitCode)
}
}

if err := term.Restore(termFd, oldState); err != nil {
if err := term.Restore(inputFd, oldState); err != nil {
return err
}

Expand Down