Skip to content

fix(formatter): handle nil JSON values #14153

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

Open
zloglevel wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

fix(formatter): handle nil JSON values #14153

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions cmd/formatter/formatter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func Print(toJSON any, format string, outWriter io.Writer, writerFn func(w io.Wr
case TABLE, PRETTY, "":
return PrintPrettySection(outWriter, writerFn, headers...)
case TemplateLegacyJSON:
switch reflect.TypeOf(toJSON).Kind() {
switch reflect.ValueOf(toJSON).Kind() {
case reflect.Slice:
s := reflect.ValueOf(toJSON)
for i := 0; i < s.Len(); i++ {
Expand All @@ -50,7 +50,7 @@ func Print(toJSON any, format string, outWriter io.Writer, writerFn func(w io.Wr
_, _ = fmt.Fprintln(outWriter, outJSON)
}
case JSON:
switch reflect.TypeOf(toJSON).Kind() {
switch reflect.ValueOf(toJSON).Kind() {
case reflect.Slice:
outJSON, err := ToJSON(toJSON, "", "")
if err != nil {
Expand Down
10 changes: 10 additions & 0 deletions cmd/formatter/formatter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ func TestPrint(t *testing.T) {
`)
}

func TestPrintNilAsJSON(t *testing.T) {
for _, format := range []string{JSON, TemplateLegacyJSON} {
t.Run(format, func(t *testing.T) {
var output bytes.Buffer
assert.NilError(t, Print(nil, format, &output, func(io.Writer) {}))
assert.Equal(t, output.String(), "null\n")
})
}
}

func TestColorsGoroutinesLeak(t *testing.T) {
goleak.VerifyNone(t)
}