Mono repo -> Master (#22553)

Combines the following repositories into one:

https://github.com/mattermost/mattermost-server
https://github.com/mattermost/mattermost-webapp
https://github.com/mattermost/focalboard
https://github.com/mattermost/mattermost-plugin-playbooks

server/config/common_test.go

@@ -0,0 +1,182 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+package config
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/mattermost/mattermost-server/v6/model"
+)
+
+var emptyConfig, readOnlyConfig, minimalConfig, minimalConfigNoFF, invalidConfig, fixesRequiredConfig, ldapConfig, testConfig, customConfigDefaults *model.Config
+
+func init() {
+	emptyConfig = &model.Config{}
+	readOnlyConfig = &model.Config{
+		ClusterSettings: model.ClusterSettings{
+			Enable:         model.NewBool(true),
+			ReadOnlyConfig: model.NewBool(true),
+		},
+	}
+	minimalConfig = &model.Config{
+		ServiceSettings: model.ServiceSettings{
+			SiteURL: model.NewString("http://minimal"),
+		},
+		SqlSettings: model.SqlSettings{
+			AtRestEncryptKey: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
+		},
+		FileSettings: model.FileSettings{
+			PublicLinkSalt: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
+		},
+		LocalizationSettings: model.LocalizationSettings{
+			DefaultServerLocale: model.NewString("en"),
+			DefaultClientLocale: model.NewString("en"),
+		},
+	}
+
+	minimalConfig.SetDefaults()
+
+	minimalConfigNoFF = minimalConfig.Clone()
+	minimalConfigNoFF.FeatureFlags = nil
+
+	invalidConfig = &model.Config{
+		ServiceSettings: model.ServiceSettings{
+			SiteURL: model.NewString("invalid"),
+		},
+	}
+	fixesRequiredConfig = &model.Config{
+		ServiceSettings: model.ServiceSettings{
+			SiteURL: model.NewString("http://trailingslash/"),
+		},
+		SqlSettings: model.SqlSettings{
+			AtRestEncryptKey: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
+		},
+		FileSettings: model.FileSettings{
+			DriverName:     model.NewString(model.ImageDriverLocal),
+			Directory:      model.NewString("/path/to/directory"),
+			PublicLinkSalt: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
+		},
+		LocalizationSettings: model.LocalizationSettings{
+			DefaultServerLocale: model.NewString("garbage"),
+			DefaultClientLocale: model.NewString("garbage"),
+		},
+	}
+	ldapConfig = &model.Config{
+		LdapSettings: model.LdapSettings{
+			BindPassword: model.NewString("password"),
+		},
+	}
+	testConfig = &model.Config{
+		ServiceSettings: model.ServiceSettings{
+			SiteURL: model.NewString("http://TestStoreNew"),
+		},
+	}
+	customConfigDefaults = &model.Config{
+		ServiceSettings: model.ServiceSettings{
+			SiteURL: model.NewString("http://custom.com"),
+		},
+		DisplaySettings: model.DisplaySettings{
+			ExperimentalTimezone: model.NewBool(false),
+		},
+	}
+}
+
+func TestMergeConfigs(t *testing.T) {
+	t.Run("merge two default configs with different salts/keys", func(t *testing.T) {
+		base := &model.Config{}
+		base.SetDefaults()
+		patch := &model.Config{}
+		patch.SetDefaults()
+
+		merged, err := Merge(base, patch, nil)
+		require.NoError(t, err)
+
+		assert.Equal(t, patch, merged)
+	})
+	t.Run("merge identical configs", func(t *testing.T) {
+		base := &model.Config{}
+		base.SetDefaults()
+		patch := base.Clone()
+
+		merged, err := Merge(base, patch, nil)
+		require.NoError(t, err)
+
+		assert.Equal(t, base, merged)
+		assert.Equal(t, patch, merged)
+	})
+	t.Run("merge configs with a different setting", func(t *testing.T) {
+		base := &model.Config{}
+		base.SetDefaults()
+		patch := base.Clone()
+		patch.ServiceSettings.SiteURL = model.NewString("http://newhost.ca")
+
+		merged, err := Merge(base, patch, nil)
+		require.NoError(t, err)
+
+		assert.NotEqual(t, base, merged)
+		assert.Equal(t, patch, merged)
+	})
+	t.Run("merge default config with changes from a mostly nil patch", func(t *testing.T) {
+		base := &model.Config{}
+		base.SetDefaults()
+		patch := &model.Config{}
+		patch.ServiceSettings.SiteURL = model.NewString("http://newhost.ca")
+		patch.GoogleSettings.Enable = model.NewBool(true)
+
+		expected := base.Clone()
+		expected.ServiceSettings.SiteURL = model.NewString("http://newhost.ca")
+		expected.GoogleSettings.Enable = model.NewBool(true)
+
+		merged, err := Merge(base, patch, nil)
+		require.NoError(t, err)
+
+		assert.NotEqual(t, base, merged)
+		assert.NotEqual(t, patch, merged)
+		assert.Equal(t, expected, merged)
+	})
+}
+
+func TestConfigEnvironmentOverrides(t *testing.T) {
+	memstore, err := NewMemoryStore()
+	require.NoError(t, err)
+	base, err := NewStoreFromBacking(memstore, nil, false)
+	require.NoError(t, err)
+	originalConfig := &model.Config{}
+	originalConfig.ServiceSettings.SiteURL = model.NewString("http://notoverridden.ca")
+
+	os.Setenv("MM_SERVICESETTINGS_SITEURL", "http://overridden.ca")
+	defer os.Unsetenv("MM_SERVICESETTINGS_SITEURL")
+
+	t.Run("loading config should respect environment variable overrides", func(t *testing.T) {
+		err := base.Load()
+		require.NoError(t, err)
+
+		assert.Equal(t, "http://overridden.ca", *base.Get().ServiceSettings.SiteURL)
+	})
+
+	t.Run("setting config should respect environment variable overrides", func(t *testing.T) {
+		_, _, err := base.Set(originalConfig)
+		require.NoError(t, err)
+
+		assert.Equal(t, "http://overridden.ca", *base.Get().ServiceSettings.SiteURL)
+	})
+}
+
+func TestRemoveEnvironmentOverrides(t *testing.T) {
+	os.Setenv("MM_SERVICESETTINGS_SITEURL", "http://overridden.ca")
+	defer os.Unsetenv("MM_SERVICESETTINGS_SITEURL")
+
+	memstore, err := NewMemoryStore()
+	require.NoError(t, err)
+	base, err := NewStoreFromBacking(memstore, nil, false)
+	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)
+}