Skip to content
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

Jump to bottom

Pinning interop: Pin ls returns appropriate zero value #6685

Merged
merged 2 commits into from
Oct 7, 2019
Merged

Pinning interop: Pin ls returns appropriate zero value #6685

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1cd629
pin ls returns the appropriate zero value if no pins are found.
aschmahmann Sep 27, 2019
69bb578
Pin LS command emits custom JSON to handle streaming case
aschmahmann Oct 7, 2019
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
14 changes: 13 additions & 1 deletion core/commands/pin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package commands

import (
"context"
"encoding/json"
"fmt"
"io"
"os"
Expand Down Expand Up @@ -367,6 +368,17 @@ Example:
},
Type: &PinLsOutputWrapper{},
Encoders: cmds.EncoderMap{
cmds.JSON: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *PinLsOutputWrapper) error {
stream, _ := req.Options[pinStreamOptionName].(bool)

enc := json.NewEncoder(w)

if stream {
return enc.Encode(out.PinLsObject)
}

return enc.Encode(out.PinLsList)
}),
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *PinLsOutputWrapper) error {
quiet, _ := req.Options[pinQuietOptionName].(bool)
stream, _ := req.Options[pinStreamOptionName].(bool)
Expand Down Expand Up @@ -403,7 +415,7 @@ type PinLsOutputWrapper struct {

// PinLsList is a set of pins with their type
type PinLsList struct {
Keys map[string]PinLsType `json:",omitempty"`
Keys map[string]PinLsType
}

// PinLsType contains the type of a pin
Expand Down