fix terminal console check

glours · glours · commit 876625c40741 · 2024-06-24T10:56:34.000+02:00
this was broken by cli v27 release and usage of stream writer for the stderr
the new type encapsulates the io.Writer and don't pass the console.File type assertion

Signed-off-by: Guillaume Lours &lt;705411+glours@users.noreply.github.com&gt;
diff --git a/pkg/compose/compose.go b/pkg/compose/compose.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 	"strconv"
 	"strings"
@@ -129,11 +128,11 @@ func (s *composeService) stdin() *streams.In {
 	return s.dockerCli.In()
 }
 
-func (s *composeService) stderr() io.Writer {
+func (s *composeService) stderr() *streams.Out {
 	return s.dockerCli.Err()
 }
 
-func (s *composeService) stdinfo() io.Writer {
+func (s *composeService) stdinfo() *streams.Out {
 	if stdioToStdout {
 		return s.dockerCli.Out()
 	}
diff --git a/pkg/progress/console.go b/pkg/progress/console.go
@@ -0,0 +1,31 @@
+//go:build !windows
+// +build !windows
+
+/*
+   Copyright 2020 Docker Compose CLI authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package progress
+
+import (
+	"os"
+
+	"github.com/containerd/console"
+)
+
+func checkConsole(fd uintptr) (console.File, bool) {
+	file := os.NewFile(fd, "")
+	return file, file != nil
+}
diff --git a/pkg/progress/console_windows.go b/pkg/progress/console_windows.go
@@ -0,0 +1,36 @@
+//go:build windows
+// +build windows
+
+/*
+   Copyright 2020 Docker Compose CLI authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package progress
+
+import (
+	"os"
+
+	"github.com/containerd/console"
+	"golang.org/x/sys/windows"
+)
+
+func checkConsole(fd uintptr) (console.File, bool) {
+	var mode uint32
+	if err := windows.GetConsoleMode(windows.Handle(fd), &mode); err != nil {
+		return nil, false
+	}
+	file := os.NewFile(fd, "")
+	return file, file != nil
+}
diff --git a/pkg/progress/writer.go b/pkg/progress/writer.go
@@ -22,11 +22,11 @@ import (
 	"sync"
 
 	"github.com/containerd/console"
+	"github.com/docker/cli/cli/streams"
+	"github.com/docker/compose/v2/pkg/api"
 	"github.com/moby/term"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
-
-	"github.com/docker/compose/v2/pkg/api"
 )
 
 // Writer can write multiple progress events
@@ -116,15 +116,22 @@ var Mode = ModeAuto
 
 // NewWriter returns a new multi-progress writer
 func NewWriter(ctx context.Context, out io.Writer, progressTitle string) (Writer, error) {
-	_, isTerminal := term.GetFdInfo(out)
+	var isTerminal bool
+	var fd uintptr
+	if stream, ok := out.(*streams.Out); ok {
+		isTerminal = stream.IsTerminal()
+		fd = stream.FD()
+	} else {
+		fd, isTerminal = term.GetFdInfo(out)
+	}
 	dryRun, ok := ctx.Value(api.DryRunKey{}).(bool)
 	if !ok {
 		dryRun = false
 	}
 	if Mode == ModeQuiet {
 		return quiet{}, nil
 	}
-	f, isConsole := out.(console.File) // see https://github.com/docker/compose/issues/10560
+	f, isConsole := checkConsole(fd) // see https://github.com/docker/compose/issues/10560
 	if Mode == ModeAuto && isTerminal && isConsole {
 		return newTTYWriter(f, dryRun, progressTitle)
 	}

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import (`
`20`	`20`	`"context"`
`21`	`21`	`"errors"`
`22`	`22`	`"fmt"`
`23`		`- "io"`
`24`	`23`	`"os"`
`25`	`24`	`"strconv"`
`26`	`25`	`"strings"`
`@@ -129,11 +128,11 @@ func (s composeService) stdin() streams.In {`
`129`	`128`	`return s.dockerCli.In()`
`130`	`129`	`}`
`131`	`130`
`132`		`-func (s *composeService) stderr() io.Writer {`
	`131`	`+func (s composeService) stderr() streams.Out {`
`133`	`132`	`return s.dockerCli.Err()`
`134`	`133`	`}`
`135`	`134`
`136`		`-func (s *composeService) stdinfo() io.Writer {`
	`135`	`+func (s composeService) stdinfo() streams.Out {`
`137`	`136`	`if stdioToStdout {`
`138`	`137`	`return s.dockerCli.Out()`
`139`	`138`	`}`