Skip to content

Commit 8c6ffda

Browse files
authored
Remove unnecessary parameter (#29092)
The parameter extraConfigs has never been used anywhere. This PR just removed it. It can be taken back once it's needed.
1 parent 98e7e3a commit 8c6ffda

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

models/unittest/testdb.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ func fatalTestError(fmtStr string, args ...any) {
4444
}
4545

4646
// InitSettings initializes config provider and load common settings for tests
47-
func InitSettings(extraConfigs ...string) {
47+
func InitSettings() {
4848
if setting.CustomConf == "" {
4949
setting.CustomConf = filepath.Join(setting.CustomPath, "conf/app-unittest-tmp.ini")
5050
_ = os.Remove(setting.CustomConf)
5151
}
52-
setting.InitCfgProvider(setting.CustomConf, strings.Join(extraConfigs, "\n"))
52+
setting.InitCfgProvider(setting.CustomConf)
5353
setting.LoadCommonSettings()
5454

5555
if err := setting.PrepareAppDataPath(); err != nil {

modules/setting/config_provider.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func NewConfigProviderFromData(configContent string) (ConfigProvider, error) {
196196

197197
// NewConfigProviderFromFile load configuration from file.
198198
// NOTE: do not print any log except error.
199-
func NewConfigProviderFromFile(file string, extraConfigs ...string) (ConfigProvider, error) {
199+
func NewConfigProviderFromFile(file string) (ConfigProvider, error) {
200200
cfg := ini.Empty(configProviderLoadOptions())
201201
loadedFromEmpty := true
202202

@@ -213,12 +213,6 @@ func NewConfigProviderFromFile(file string, extraConfigs ...string) (ConfigProvi
213213
}
214214
}
215215

216-
for _, s := range extraConfigs {
217-
if err := cfg.Append([]byte(s)); err != nil {
218-
return nil, fmt.Errorf("unable to append more config: %v", err)
219-
}
220-
}
221-
222216
cfg.NameMapper = ini.SnackCase
223217
return &iniConfigProvider{
224218
file: file,

modules/setting/setting.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ func PrepareAppDataPath() error {
9090
return nil
9191
}
9292

93-
func InitCfgProvider(file string, extraConfigs ...string) {
93+
func InitCfgProvider(file string) {
9494
var err error
95-
if CfgProvider, err = NewConfigProviderFromFile(file, extraConfigs...); err != nil {
95+
if CfgProvider, err = NewConfigProviderFromFile(file); err != nil {
9696
log.Fatal("Unable to init config provider from %q: %v", file, err)
9797
}
9898
CfgProvider.DisableSaving() // do not allow saving the CfgProvider into file, it will be polluted by the "MustXxx" calls

0 commit comments

Comments
 (0)