🐞 Pass hacked stdin, and don't pass stdout to bubbletea

pkg/output/tui/bubbletea964.go

@@ -28,9 +28,13 @@ import (
 //
 // TODO: Remove this function once the issue is resolved.
 func safeguardBubbletea964(in io.Reader) io.Reader {
-	if in == nil || in == os.Stdin {
+	if in == nil {
 		return in
 	}
+	if in == os.Stdin {
+		// this is not a *os.File, so it will not try to do the epoll stuff
+		return bubbletea964Input{Reader: in}
+	}
 	if f, ok := in.(*os.File); ok {
 		if st, err := f.Stat(); err != nil {
 			log.Fatal("unexpected: ", err)
@@ -47,3 +51,7 @@ func safeguardBubbletea964(in io.Reader) io.Reader {
 	}
 	return in
 }
+
+type bubbletea964Input struct {
+	io.Reader
+}

pkg/output/tui/bubbletea964_test.go

@@ -28,14 +28,15 @@ func TestSafeguardBubbletea964(t *testing.T) {
 	t.Parallel()
 	tmp := t.TempDir()
 	assert.NilError(t, os.WriteFile(tmp+"/file", []byte("test"), 0o600))
+	td := openFile(t, tmp)
 	tf := openFile(t, tmp+"/file")
 	tcs := []safeguardBubbletea964TestCase{{
 		name: "nil input",
 		in:   nil,
 		want: nil,
 	}, {
 		name: "non-regular file",
-		in:   os.NewFile(0, "/"),
+		in:   os.NewFile(td.Fd(), "/"),
 		want: nil,
 	}, {
 		name: "regular file",
@@ -48,18 +49,12 @@ func TestSafeguardBubbletea964(t *testing.T) {
 	}, {
 		name: "stdin",
 		in:   os.Stdin,
-		want: os.Stdin,
+		want: bubbletea964Input{Reader: os.Stdin},
 	}}
 	for _, tc := range tcs {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
-			if tf, ok := tc.in.(*os.File); ok {
-				defer func(tf *os.File) {
-					_ = tf.Close()
-				}(tf)
-			}
-
 			got := safeguardBubbletea964(tc.in)
 			assert.Equal(t, got, tc.want)
 		})
@@ -77,5 +72,8 @@ func openFile(tb testing.TB, name string) *os.File {
 	tb.Helper()
 	f, err := os.Open(name)
 	assert.NilError(tb, err)
+	tb.Cleanup(func() {
+		assert.NilError(tb, f.Close())
+	})
 	return f
 }

pkg/output/tui/io.go

@@ -0,0 +1,33 @@
+/*
+ Copyright 2024 The Knative 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 tui
+
+import (
+	"os"
+
+	tea "github.com/charmbracelet/bubbletea"
+	"knative.dev/client-pkg/pkg/output"
+)
+
+func ioProgramOptions(io output.InputOutput) []tea.ProgramOption {
+	opts := make([]tea.ProgramOption, 0, 2)
+	opts = append(opts, tea.WithInput(safeguardBubbletea964(io.InOrStdin())))
+	if io.OutOrStdout() != nil && io.OutOrStdout() != os.Stdout {
+		opts = append(opts, tea.WithOutput(io.OutOrStdout()))
+	}
+	return opts
+}

pkg/output/tui/progress.go

@@ -241,10 +241,7 @@ func (b *BubbleProgress) tickSpeed() tea.Cmd {
 
 func (b *BubbleProgress) start() {
 	b.prog = progress.New(progress.WithDefaultGradient())
-	b.tea = tea.NewProgram(b,
-		tea.WithInput(safeguardBubbletea964(b.InOrStdin())),
-		tea.WithOutput(b.OutOrStdout()),
-	)
+	b.tea = tea.NewProgram(b, ioProgramOptions(b.InputOutput)...)
 	b.quitChan = make(chan struct{})
 	go func() {
 		t := b.tea

pkg/output/tui/spinner.go

@@ -78,10 +78,7 @@ func (b *BubbleSpinner) start() {
 		spinner.WithSpinner(spinner.Meter),
 		spinner.WithStyle(spinnerStyle()),
 	)
-	b.tea = tea.NewProgram(b,
-		tea.WithInput(safeguardBubbletea964(b.InOrStdin())),
-		tea.WithOutput(b.OutOrStdout()),
-	)
+	b.tea = tea.NewProgram(b, ioProgramOptions(b.InputOutput)...)
 	b.quitChan = make(chan struct{})
 	go func() {
 		t := b.tea