toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image/tree: Respect NO_COLOR env variable

Browse Source 
Do not use the fancy colored output if NO_COLOR variable is set to 1
following the https://no-color.org/ convention.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski
2025-11-13 11:31:05 +01:00
parent 88e324150b
commit be9e6308f5
5 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/command/image/tree.go
View File

@ -292,7 +292,7 @@ func printImageTree(outs command.Streams, view treeView) {
Width: func() int {
maxChipsWidth := 0
for _, chip := range possibleChips {
s := chip.String(isTerm)
s := out.Sprint(chip)
l := tui.Width(s)
maxChipsWidth += l
}
@ -308,9 +308,9 @@ func printImageTree(outs command.Streams, view treeView) {
var b strings.Builder
for _, chip := range possibleChips {
if chip.check(d) {
b.WriteString(chip.String(isTerm))
b.WriteString(out.Sprint(chip))
} else {
b.WriteString(chipPlaceholder.String(isTerm))
b.WriteString(out.Sprint(chipPlaceholder))
}
}
return b.String()

28
cli/command/image/tree_test.go
View File

@ -15,6 +15,7 @@ func TestPrintImageTreeAnsiTty(t *testing.T) {
stdoutTty bool
stderrTty bool
expectedAnsi bool
noColorEnv bool
}{
{
name: "non-terminal",
@ -80,6 +81,24 @@ func TestPrintImageTreeAnsiTty(t *testing.T) {
expectedAnsi: false,
},
{
name: "no-color-env",
stdinTty: false,
stdoutTty: false,
stderrTty: false,
noColorEnv: true,
expectedAnsi: false,
},
{
name: "no-color-env-terminal",
stdinTty: true,
stdoutTty: true,
stderrTty: true,
noColorEnv: true,
expectedAnsi: false,
},
}
mockView := treeView{
@ -115,6 +134,11 @@ func TestPrintImageTreeAnsiTty(t *testing.T) {
cli.In().SetIsTerminal(tc.stdinTty)
cli.Out().SetIsTerminal(tc.stdoutTty)
cli.Err().SetIsTerminal(tc.stderrTty)
if tc.noColorEnv {
t.Setenv("NO_COLOR", "1")
} else {
t.Setenv("NO_COLOR", "")
}
printImageTree(cli, mockView)
@ -123,9 +147,9 @@ func TestPrintImageTreeAnsiTty(t *testing.T) {
hasAnsi := strings.Contains(out, "\x1b[")
if tc.expectedAnsi {
assert.Check(t, hasAnsi, "Output should contain ANSI escape codes")
assert.Check(t, hasAnsi, "Output should contain ANSI escape codes, output: %s", out)
} else {
assert.Check(t, !hasAnsi, "Output should not contain ANSI escape codes")
assert.Check(t, !hasAnsi, "Output should not contain ANSI escape codes, output: %s", out)
}
})
}