forked from gitea/gitea
Fix `environment-to-ini` inherited key bug (#27543)
Fix #27541 The INI package has a quirk: by default, the keys are inherited. When maintaining the keys, the newly added sub key should not be affected by the parent key.
This commit is contained in:
parent
28ead9ea62
commit
e2e0280108
|
@ -149,8 +149,9 @@ func EnvironmentToConfig(cfg ConfigProvider, envs []string) (changed bool) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
key := section.Key(keyName)
|
key := ConfigSectionKey(section, keyName)
|
||||||
if key == nil {
|
if key == nil {
|
||||||
|
changed = true
|
||||||
key, err = section.NewKey(keyName, keyValue)
|
key, err = section.NewKey(keyName, keyValue)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Error creating key: %s in section: %s with value: %s : %v", keyName, sectionName, keyValue, err)
|
log.Error("Error creating key: %s in section: %s with value: %s : %v", keyName, sectionName, keyValue, err)
|
||||||
|
|
|
@ -115,3 +115,29 @@ key = old
|
||||||
EnvironmentToConfig(cfg, []string{"GITEA__sec__key__FILE=" + tmpFile})
|
EnvironmentToConfig(cfg, []string{"GITEA__sec__key__FILE=" + tmpFile})
|
||||||
assert.Equal(t, "value-from-file\n", cfg.Section("sec").Key("key").String())
|
assert.Equal(t, "value-from-file\n", cfg.Section("sec").Key("key").String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEnvironmentToConfigSubSecKey(t *testing.T) {
|
||||||
|
// the INI package has a quirk: by default, the keys are inherited.
|
||||||
|
// when maintaining the keys, the newly added sub key should not be affected by the parent key.
|
||||||
|
cfg, err := NewConfigProviderFromData(`
|
||||||
|
[sec]
|
||||||
|
key = some
|
||||||
|
`)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
changed := EnvironmentToConfig(cfg, []string{"GITEA__sec_0X2E_sub__key=some"})
|
||||||
|
assert.True(t, changed)
|
||||||
|
|
||||||
|
tmpFile := t.TempDir() + "/test-sub-sec-key.ini"
|
||||||
|
defer os.Remove(tmpFile)
|
||||||
|
err = cfg.SaveTo(tmpFile)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
bs, err := os.ReadFile(tmpFile)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, `[sec]
|
||||||
|
key = some
|
||||||
|
|
||||||
|
[sec.sub]
|
||||||
|
key = some
|
||||||
|
`, string(bs))
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue