mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(util): Use YAML parser for both JSON & YAML files

Browse source 
JSON is a subset of YAML and the previous detection logic is
unnecessary.
This commit is contained in:
Vincent Ambo 2018-06-09 20:13:57 +02:00 committed by Vincent Ambo
parent b33c353233
commit 141355f350
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.go
View file

@ -35,8 +35,8 @@ var (
app = kingpin.New("kontemplate", "simple Kubernetes resource templating")
// Global flags
includes = app.Flag("include", "Resource sets to include explicitly").Short('i').Strings()
excludes = app.Flag("exclude", "Resource sets to exclude explicitly").Short('e').Strings()
includes = app.Flag("include", "Resource sets to include explicitly").Short('i').Strings()
excludes = app.Flag("exclude", "Resource sets to exclude explicitly").Short('e').Strings()
variables = app.Flag("var", "Provide variables to templates explicitly").Strings()
// Commands

17
util/util.go
View file

@ -10,10 +10,7 @@
package util
import (
"encoding/json"
"fmt"
"io/ioutil"
"strings"
"github.com/ghodss/yaml"
)
@ -44,19 +41,17 @@ 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 {
// Loads either a YAML or JSON file from the specified path and
// deserialises it into the provided interface.
func LoadData(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.")
err = yaml.Unmarshal(file, addr)
if err != nil {
return err
}
return nil