Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add YAML support #16

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add YAML support #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e680a26
Require gopkg.in/yaml.v2
chris-hamper Aug 13, 2021
fad9f24
Support loading of settings from YAML files
chris-hamper Aug 13, 2021
b225f9c
Add 'toYaml' template function
chris-hamper Aug 13, 2021
885aec3
Match suffix on temp file
chris-hamper Aug 13, 2021
fbe4201
go mod tidy
chris-hamper Aug 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ go 1.12
require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/google/uuid v1.2.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/luraproject/lura v1.4.0 // indirect
github.com/luraproject/lura v1.4.0
github.com/mitchellh/copystructure v1.1.1 // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
gopkg.in/yaml.v2 v2.4.0
)
8 changes: 6 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3Q
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60=
github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/devopsfaith/flatmap v0.0.0-20200601181759-8521186182fc h1:WM1VdC8LW8GIZUJuvXgQWm6LcZ8niL0D0WVuC3lKkQU=
github.com/devopsfaith/flatmap v0.0.0-20200601181759-8521186182fc/go.mod h1:J9Y/58s7wx7HbHT3i4UKNwLGuBB9qCf0/JUdEFGDPmA=
github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0=
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
Expand All @@ -27,12 +27,13 @@ github.com/mitchellh/copystructure v1.1.1 h1:Bp6x9R1Wn16SIz3OfeDr0b7RnCG2OB66Y7P
github.com/mitchellh/copystructure v1.1.1/go.mod h1:EBArHfARyrSWO/+Wyr9zwEkc6XMFB9XyNgFNmRkZZU4=
github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE=
github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/ugorji/go v0.0.0-20180112141927-9831f2c3ac10/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
github.com/urfave/negroni v0.3.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
github.com/valyala/fastrand v1.0.0 h1:LUKT9aKer2dVQNUi3waewTbKV+7H17kvWFNKs2ObdkI=
github.com/valyala/fastrand v1.0.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w=
Expand All @@ -46,8 +47,11 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
37 changes: 31 additions & 6 deletions template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (

"github.com/Masterminds/sprig"
"github.com/luraproject/lura/config"
"gopkg.in/yaml.v2"
)

type Config struct {
Expand Down Expand Up @@ -42,20 +43,31 @@ func NewTemplateParser(cfg Config) *TemplateParser {
files = []os.FileInfo{}
}
for _, settingsFile := range files {
if !strings.HasSuffix(settingsFile.Name(), ".json") {
suffix := fileSuffix(settingsFile.Name())
if suffix != ".json" && suffix != ".yaml" && suffix != ".yml" {
continue
}

b, err := ioutil.ReadFile(filepath.Join(cfg.Settings, settingsFile.Name()))
if err != nil {
t.err.errors[settingsFile.Name()] = err
continue
}

var v map[string]interface{}
if err := json.Unmarshal(b, &v); err != nil {
t.err.errors[settingsFile.Name()] = err
continue
if suffix == ".json" {
if err := json.Unmarshal(b, &v); err != nil {
t.err.errors[settingsFile.Name()] = err
continue
}
} else { // "yaml" or "yml"
if err := yaml.Unmarshal(b, &v); err != nil {
t.err.errors[settingsFile.Name()] = err
continue
}
}
t.Vars[strings.TrimSuffix(filepath.Base(settingsFile.Name()), ".json")] = v

t.Vars[strings.TrimSuffix(filepath.Base(settingsFile.Name()), suffix)] = v
}
}

Expand All @@ -76,6 +88,7 @@ func NewTemplateParser(cfg Config) *TemplateParser {
t.funcMap = sprig.GenericFuncMap()
t.funcMap["marshal"] = t.marshal
t.funcMap["include"] = t.include
t.funcMap["toYaml"] = t.toYaml

return t
}
Expand All @@ -99,6 +112,8 @@ func (t *TemplateParser) Parse(configFile string) (config.ServiceConfig, error)
return config.ServiceConfig{}, t.err
}

suffix := fileSuffix(configFile)

tmpfile, err := ioutil.TempFile("", "KrakenD_parsed_config_template_")
if err != nil {
log.Fatal("creating the tmp file:", err)
Expand Down Expand Up @@ -134,7 +149,7 @@ func (t *TemplateParser) Parse(configFile string) (config.ServiceConfig, error)
log.Fatal("closing the tmp config:", err)
}

filename := tmpfile.Name() + ".json"
filename := tmpfile.Name() + suffix
if t.Path != "" {
filename = t.Path
}
Expand All @@ -156,6 +171,11 @@ func (t *TemplateParser) marshal(v interface{}) string {
return string(a)
}

func (t *TemplateParser) toYaml(v interface{}) string {
a, _ := yaml.Marshal(v)
return string(a)
}

func (t *TemplateParser) include(v interface{}) string {
a, _ := ioutil.ReadFile(path.Join(t.Partials, v.(string)))
return string(a)
Expand Down Expand Up @@ -226,3 +246,8 @@ func copyFile(src, dst string) (err error) {

return
}

func fileSuffix(s string) string {
lastDot := strings.LastIndex(s, ".")
return s[lastDot:]
}