Skip to content

Commit e92cd43

Browse files
committed
add IOStreams.ReadUserFile
1 parent d6c9004 commit e92cd43

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

pkg/cmd/api/api.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ func parseField(f string) (string, string, error) {
403403

404404
func magicFieldValue(v string, opts *ApiOptions) (interface{}, error) {
405405
if strings.HasPrefix(v, "@") {
406-
return readUserFile(v[1:], opts.IO.In)
406+
return opts.IO.ReadUserFile(v[1:])
407407
}
408408

409409
if n, err := strconv.Atoi(v); err == nil {
@@ -422,21 +422,6 @@ func magicFieldValue(v string, opts *ApiOptions) (interface{}, error) {
422422
}
423423
}
424424

425-
func readUserFile(fn string, stdin io.ReadCloser) ([]byte, error) {
426-
var r io.ReadCloser
427-
if fn == "-" {
428-
r = stdin
429-
} else {
430-
var err error
431-
r, err = os.Open(fn)
432-
if err != nil {
433-
return nil, err
434-
}
435-
}
436-
defer r.Close()
437-
return ioutil.ReadAll(r)
438-
}
439-
440425
func openUserFile(fn string, stdin io.ReadCloser) (io.ReadCloser, int64, error) {
441426
if fn == "-" {
442427
return stdin, -1, nil

pkg/iostreams/iostreams.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,21 @@ func (s *IOStreams) ColorScheme() *ColorScheme {
253253
return NewColorScheme(s.ColorEnabled(), s.ColorSupport256())
254254
}
255255

256+
func (s *IOStreams) ReadUserFile(fn string) ([]byte, error) {
257+
var r io.ReadCloser
258+
if fn == "-" {
259+
r = s.In
260+
} else {
261+
var err error
262+
r, err = os.Open(fn)
263+
if err != nil {
264+
return nil, err
265+
}
266+
}
267+
defer r.Close()
268+
return ioutil.ReadAll(r)
269+
}
270+
256271
func System() *IOStreams {
257272
stdoutIsTTY := isTerminal(os.Stdout)
258273
stderrIsTTY := isTerminal(os.Stderr)

0 commit comments

Comments
 (0)