From e9346fc4a9cebddbe277e0c2447e18c18c3f947a Mon Sep 17 00:00:00 2001 From: zeripath Date: Fri, 25 Sep 2020 16:19:20 +0100 Subject: [PATCH] Allow extended config on cron settings (#12939) (#12943) Backport #12939 Fix #12934 Signed-off-by: Andrew Thornton --- modules/setting/cron.go | 22 +++++++++++++++-- modules/setting/cron_test.go | 47 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 modules/setting/cron_test.go diff --git a/modules/setting/cron.go b/modules/setting/cron.go index c8228ddaa8..9475887ecc 100644 --- a/modules/setting/cron.go +++ b/modules/setting/cron.go @@ -4,8 +4,26 @@ package setting +import "reflect" + // GetCronSettings maps the cron subsection to the provided config func GetCronSettings(name string, config interface{}) (interface{}, error) { - err := Cfg.Section("cron." + name).MapTo(config) - return config, err + if err := Cfg.Section("cron." + name).MapTo(config); err != nil { + return config, err + } + + typ := reflect.TypeOf(config).Elem() + val := reflect.ValueOf(config).Elem() + + for i := 0; i < typ.NumField(); i++ { + field := val.Field(i) + tpField := typ.Field(i) + if tpField.Type.Kind() == reflect.Struct && tpField.Anonymous { + if err := Cfg.Section("cron." + name).MapTo(field.Addr().Interface()); err != nil { + return config, err + } + } + } + + return config, nil } diff --git a/modules/setting/cron_test.go b/modules/setting/cron_test.go new file mode 100644 index 0000000000..8670a92bac --- /dev/null +++ b/modules/setting/cron_test.go @@ -0,0 +1,47 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package setting + +import ( + "testing" + + "github.com/stretchr/testify/assert" + ini "gopkg.in/ini.v1" +) + +func Test_GetCronSettings(t *testing.T) { + + type BaseStruct struct { + Base bool + Second string + } + + type Extended struct { + BaseStruct + Extend bool + } + + iniStr := ` +[cron.test] +Base = true +Second = white rabbit +Extend = true +` + Cfg, _ = ini.Load([]byte(iniStr)) + + extended := &Extended{ + BaseStruct: BaseStruct{ + Second: "queen of hearts", + }, + } + + _, err := GetCronSettings("test", extended) + + assert.NoError(t, err) + assert.True(t, extended.Base) + assert.EqualValues(t, extended.Second, "white rabbit") + assert.True(t, extended.Extend) + +}