STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix assigning null Exporter

Browse source
This commit is contained in:
Mislav Marohnić 2021-04-14 19:11:08 +02:00
parent 7ec5b0f8cf
commit 625505dcfb
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkg/cmdutil/json_flags.go
View file

@ -33,7 +33,11 @@ func AddJSONFlags(cmd *cobra.Command, exportTarget *Exporter, fields []string) {
}
}
if export, err := checkJSONFlags(c); err == nil {
*exportTarget = export
if export == nil {
*exportTarget = nil
} else {
*exportTarget = export
}
} else {
return err
}
@ -49,7 +53,7 @@ func AddJSONFlags(cmd *cobra.Command, exportTarget *Exporter, fields []string) {
})
}
func checkJSONFlags(cmd *cobra.Command) (*ExportFormat, error) {
func checkJSONFlags(cmd *cobra.Command) (*exportFormat, error) {
f := cmd.Flags()
jsonFlag := f.Lookup("json")
jqFlag := f.Lookup("jq")
@ -61,7 +65,7 @@ func checkJSONFlags(cmd *cobra.Command) (*ExportFormat, error) {
return nil, errors.New("cannot use `--web` with `--json`")
}
jv := jsonFlag.Value.(pflag.SliceValue)
return &ExportFormat{
return &exportFormat{
fields: jv.GetSlice(),
filter: jqFlag.Value.String(),
template: tplFlag.Value.String(),
@ -79,17 +83,17 @@ type Exporter interface {
Write(w io.Writer, data interface{}, colorEnabled bool) error
}
type ExportFormat struct {
type exportFormat struct {
fields []string
filter string
template string
}
func (e *ExportFormat) Fields() []string {
func (e *exportFormat) Fields() []string {
return e.fields
}
func (e *ExportFormat) Write(w io.Writer, data interface{}, colorEnabled bool) error {
func (e *exportFormat) Write(w io.Writer, data interface{}, colorEnabled bool) error {
buf := bytes.Buffer{}
encoder := json.NewEncoder(&buf)
encoder.SetEscapeHTML(false)