From 180aa45d40e5d58d579fcaba44b94bcb8e3e08be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sat, 8 Jan 2022 20:03:36 +0100 Subject: Fix configuration parsing, when the target field is not of a primitive type. --- pkg/config/yaml.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkg') diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go index ad1acf7..a80c80d 100644 --- a/pkg/config/yaml.go +++ b/pkg/config/yaml.go @@ -150,7 +150,7 @@ func buildOptions(globalFeedOptions *Options, options Map) (feedOptions Options, n := gv.NumField() for i := 0; i < n; i++ { - val := fv.Field(i) + field := fv.Field(i) f := fv.Type().Field(i) if f.PkgPath != "" && !f.Anonymous { @@ -166,10 +166,14 @@ func buildOptions(globalFeedOptions *Options, options Map) (feedOptions Options, set, ok := options[name] if ok { // in the map -> copy and delete - val.Set(reflect.ValueOf(set)) + value := reflect.ValueOf(set) + if !value.Type().AssignableTo(field.Type()) { + value = value.Convert(field.Type()) + } + field.Set(value) delete(options, name) } else { // not in the map -> copy from global - val.Set(gv.Field(i)) + field.Set(gv.Field(i)) } } -- cgit v1.2.3