MM-21285: Remove environment overrides before config broadcast (#13527)
While sending the config broadcast message across a cluster, we would include the environment overrides in the config. We fix this by exposing a config config store method to remove the overrides, and then calling that before saving the config across the cluster. Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
62f77d81aa
Коммит
ecb41c6eb5
@@ -162,5 +162,17 @@ func TestConfigEnvironmentOverrides(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestRemoveEnvironmentOverrides(t *testing.T) {
|
||||
os.Setenv("MM_SERVICESETTINGS_SITEURL", "http://overridden.ca")
|
||||
defer os.Unsetenv("MM_SERVICESETTINGS_SITEURL")
|
||||
|
||||
base, err := config.NewMemoryStore()
|
||||
require.NoError(t, err)
|
||||
oldCfg := base.Get()
|
||||
assert.Equal(t, "http://overridden.ca", *oldCfg.ServiceSettings.SiteURL)
|
||||
newCfg := base.RemoveEnvironmentOverrides(oldCfg)
|
||||
assert.Equal(t, "", *newCfg.ServiceSettings.SiteURL)
|
||||
}
|
||||
|
||||
func newBool(b bool) *bool { return &b }
|
||||
func newString(s string) *string { return &s }
|
||||
|
||||
Ссылка в новой задаче
Block a user