From f944124325dd785085fec59210306111b3eab3b7 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Fri, 1 May 2020 17:05:07 +0200 Subject: Yaml: Pass `Reader` around instead of []byte --- pkg/config/yaml.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkg/config/yaml.go') diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go index 93f8c10..9711130 100644 --- a/pkg/config/yaml.go +++ b/pkg/config/yaml.go @@ -2,6 +2,7 @@ package config import ( "fmt" + "io" "reflect" "strings" @@ -62,24 +63,24 @@ func (grpFeed *configGroupFeed) target() string { return grpFeed.Group.Group } -func unmarshal(buf []byte, cfg *Config) (config, error) { +func unmarshal(in io.Reader, cfg *Config) (config, error) { parsedCfg := config{Config: cfg} - if err := yaml.Unmarshal(buf, &parsedCfg); err != nil { + d := yaml.NewDecoder(in) + if err := d.Decode(&parsedCfg); err != nil && err != io.EOF { return config{}, err } - //fmt.Printf("--- parsedCfg:\n%+v\n\n", parsedCfg) return parsedCfg, nil } -func (cfg *Config) parse(buf []byte) error { +func (cfg *Config) parse(in io.Reader) error { var ( err error parsedCfg config ) - if parsedCfg, err = unmarshal(buf, cfg); err != nil { + if parsedCfg, err = unmarshal(in, cfg); err != nil { return fmt.Errorf("while unmarshalling: %w", err) } -- cgit v1.2.3-70-g09d2