Skip to content

Commit 50d310c

Browse files
committed
Fix bug at end of buffer
1 parent 3ea5452 commit 50d310c

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

cmd/cmd.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ var (
2020
)
2121

2222
var rootCmd = &cobra.Command{
23-
Use: "kubectl-grep",
24-
Short: "A plugin to grep Kubernetes resources.",
23+
Use: "kubectl-grep",
24+
Short: "A plugin to grep Kubernetes resources.",
25+
SilenceUsage: true,
2526
RunE: func(cmd *cobra.Command, args []string) error {
2627
dm := pkg.Full
2728
if summary {

pkg/decode.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,22 @@ func (r *YAMLReader) Read() ([]byte, error) {
5555
return nil, err
5656
}
5757
if rr[0] == '-' {
58+
// We hit the next entry
5859
return buffer.Bytes(), nil
5960
}
6061
if rr[0] != ' ' {
62+
// Not part of the list anymore, just be end of the list
63+
// Drain the list so we don't read more
6164
if _, err := io.Copy(io.Discard, r.reader.reader); err != nil {
6265
return nil, err
6366
}
6467
return buffer.Bytes(), nil
6568
}
6669
}
67-
_, _ = r.reader.reader.Read(listDiscard)
70+
_, err := io.ReadFull(r.reader.reader, listDiscard)
71+
if err != nil {
72+
return nil, err
73+
}
6874
firstLoop = false
6975
}
7076

pkg/grep.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func GrepResources(sel Selector, in io.Reader, out io.Writer, mode DisplayMode)
139139
}
140140
obj := KubernetesObject{}
141141
if err := yaml.Unmarshal(text, &obj); err != nil {
142-
return fmt.Errorf("failed to unmarshal yaml (%v): %v", text, err)
142+
return fmt.Errorf("failed to unmarshal yaml (%v): %v", string(text), err)
143143
}
144144
if obj.MatchesAny(sel, text) {
145145
if mode == Summary {

0 commit comments

Comments
 (0)