refactor context: Extract loadJsonOrYaml to util package
The logic to deserialise a structure from *either* JSON or YAML is reused several times and can be easily extracted, which this commit does.
This commit is contained in:
parent
e2f7cf6258
commit
3728d0ae2e
2 changed files with 30 additions and 29 deletions
27
util/util.go
27
util/util.go
|
|
@ -1,5 +1,14 @@
|
|||
package util
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"strings"
|
||||
|
||||
"github.com/ghodss/yaml"
|
||||
)
|
||||
|
||||
// Merges two maps together. Values from the second map override values in the first map.
|
||||
// The returned map is new if anything was changed.
|
||||
func Merge(in1 *map[string]interface{}, in2 *map[string]interface{}) *map[string]interface{} {
|
||||
|
|
@ -22,3 +31,21 @@ func Merge(in1 *map[string]interface{}, in2 *map[string]interface{}) *map[string
|
|||
|
||||
return &new
|
||||
}
|
||||
|
||||
// Loads either a YAML or JSON file from the specified path and deserialises it into the provided interface.
|
||||
func LoadJsonOrYaml(filename string, addr interface{}) error {
|
||||
file, err := ioutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if strings.HasSuffix(filename, "json") {
|
||||
err = json.Unmarshal(file, addr)
|
||||
} else if strings.HasSuffix(filename, "yaml") || strings.HasSuffix(filename, "yml") {
|
||||
err = yaml.Unmarshal(file, addr)
|
||||
} else {
|
||||
return fmt.Errorf("File format not supported. Must be JSON or YAML.")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue