image/tree: No legend if stdout redirected

Signed-off-by: Paweł Gronowski <[email protected]>

Author: vvoland

cli/command/image/list_test.go

@@ -80,6 +80,14 @@ func TestNewImagesCommandSuccess(t *testing.T) {
 			},
 		},
 	}
+
+	prevForceStreamRedirected := testForceStreamRedirected
+	t.Cleanup(func() {
+		testForceStreamRedirected = prevForceStreamRedirected
+	})
+	testForceStreamRedirected = new(bool)
+	*testForceStreamRedirected = false
+
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			cli := test.NewFakeCli(&fakeClient{imageListFunc: tc.imageListFunc})

cli/command/image/tree.go

@@ -225,7 +225,8 @@ func getPossibleChips(view treeView) (chips []imageChip) {
 }
 
 func printImageTree(outs command.Streams, view treeView) {
-	if streamRedirected(outs.Out()) {
+	stdoutRedirected := streamRedirected(outs.Out())
+	if stdoutRedirected {
 		_, _ = fmt.Fprintln(outs.Err(), "WARNING: This output is designed for human readability. For machine-readable output, please use --format.")
 	}
 
@@ -245,7 +246,10 @@ func printImageTree(outs command.Streams, view treeView) {
 
 	isTerm := out.IsTerminal()
 
-	out.Println(generateLegend(out, width))
+	// Don't print legend when output is redirected
+	if !stdoutRedirected {
+		out.Println(generateLegend(out, width))
+	}
 
 	possibleChips := getPossibleChips(view)
 	columns := []imgColumn{
@@ -517,7 +521,12 @@ func widestFirstColumnValue(headers []imgColumn, images []topImage) int {
 	return width
 }
 
+var testForceStreamRedirected *bool
+
 func streamRedirected(s *streams.Out) bool {
+	if testForceStreamRedirected != nil {
+		return *testForceStreamRedirected
+	}
 	fd := s.FD()
 	if os.Stdout.Fd() != fd {
 		return true

cli/command/image/tree_test.go

@@ -109,6 +109,13 @@ func TestPrintImageTreeAnsiTty(t *testing.T) {
 		imageSpacing: false,
 	}
 
+	prevForceStreamRedirected := testForceStreamRedirected
+	t.Cleanup(func() {
+		testForceStreamRedirected = prevForceStreamRedirected
+	})
+	testForceStreamRedirected = new(bool)
+	*testForceStreamRedirected = false
+
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			cli := test.NewFakeCli(nil)