Skip to content

feat(cli): add --output={text,json} to version cmd #7010

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

Merged
merged 10 commits into from
Apr 5, 2023
+192 −33
Merged

feat(cli): add --output={text,json} to version cmd #7010

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
af0508e
feat(cli): add --json output to version cmd
johnstcn Apr 5, 2023
c8c610e
fixup! feat(cli): add --json output to version cmd
johnstcn Apr 5, 2023
d3d5a69
fixup! feat(cli): add --json output to version cmd
johnstcn Apr 5, 2023
b9ada46
fixup! feat(cli): add --json output to version cmd
johnstcn Apr 5, 2023
caf2b46
fixup! feat(cli): add --json output to version cmd
johnstcn Apr 5, 2023
f218bcf
feat(cliui): add TextFormat
johnstcn Apr 5, 2023
1f403a2
use --output specifier instead
johnstcn Apr 5, 2023
a7ec68d
fixup! use --output specifier instead
johnstcn Apr 5, 2023
747e63f
gen
johnstcn Apr 5, 2023
b099e5c
strings.ReplaceAll
johnstcn Apr 5, 2023
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
Prev Previous commit
Next Next commit
feat(cliui): add TextFormat
  • Loading branch information
@johnstcn
johnstcn committed Apr 5, 2023
commit f218bcf67d79778bc6bfabe12d3804e594104e31
21 changes: 21 additions & 0 deletions cli/cliui/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cliui
import (
"context"
"encoding/json"
"fmt"
"reflect"
"strings"

Expand Down Expand Up @@ -171,3 +172,23 @@ func (jsonFormat) Format(_ context.Context, data any) (string, error) {

return string(outBytes), nil
}

type textFormat struct{}

var _ OutputFormat = textFormat{}

// TextFormat is a formatter that just outputs unstructured text.
// It uses fmt.Sprintf under the hood.
func TextFormat() OutputFormat {
return textFormat{}
}

func (textFormat) ID() string {
return "text"
}

func (textFormat) AttachOptions(_ *clibase.OptionSet) {}

func (textFormat) Format(_ context.Context, data any) (string, error) {
return fmt.Sprintf("%s", data), nil
}
3 changes: 3 additions & 0 deletions cli/cliui/output_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ func Test_OutputFormatter(t *testing.T) {
require.Panics(t, func() {
cliui.NewOutputFormatter(cliui.JSONFormat())
})
require.NotPanics(t, func() {
cliui.NewOutputFormatter(cliui.JSONFormat(), cliui.TextFormat())
})
})

t.Run("NoMissingFormatID", func(t *testing.T) {
Expand Down