коммит произвёл
GitHub
родитель
f290745496
Коммит
c3ed07e679
@@ -19,23 +19,23 @@ func init() {
|
||||
emptyConfig = &model.Config{}
|
||||
readOnlyConfig = &model.Config{
|
||||
ClusterSettings: model.ClusterSettings{
|
||||
Enable: model.NewBool(true),
|
||||
ReadOnlyConfig: model.NewBool(true),
|
||||
Enable: model.NewPointer(true),
|
||||
ReadOnlyConfig: model.NewPointer(true),
|
||||
},
|
||||
}
|
||||
minimalConfig = &model.Config{
|
||||
ServiceSettings: model.ServiceSettings{
|
||||
SiteURL: model.NewString("http://minimal"),
|
||||
SiteURL: model.NewPointer("http://minimal"),
|
||||
},
|
||||
SqlSettings: model.SqlSettings{
|
||||
AtRestEncryptKey: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
AtRestEncryptKey: model.NewPointer("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
},
|
||||
FileSettings: model.FileSettings{
|
||||
PublicLinkSalt: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
PublicLinkSalt: model.NewPointer("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
},
|
||||
LocalizationSettings: model.LocalizationSettings{
|
||||
DefaultServerLocale: model.NewString("en"),
|
||||
DefaultClientLocale: model.NewString("en"),
|
||||
DefaultServerLocale: model.NewPointer("en"),
|
||||
DefaultClientLocale: model.NewPointer("en"),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -46,39 +46,39 @@ func init() {
|
||||
|
||||
invalidConfig = &model.Config{
|
||||
ServiceSettings: model.ServiceSettings{
|
||||
SiteURL: model.NewString("invalid"),
|
||||
SiteURL: model.NewPointer("invalid"),
|
||||
},
|
||||
}
|
||||
fixesRequiredConfig = &model.Config{
|
||||
ServiceSettings: model.ServiceSettings{
|
||||
SiteURL: model.NewString("http://trailingslash/"),
|
||||
SiteURL: model.NewPointer("http://trailingslash/"),
|
||||
},
|
||||
SqlSettings: model.SqlSettings{
|
||||
AtRestEncryptKey: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
AtRestEncryptKey: model.NewPointer("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
},
|
||||
FileSettings: model.FileSettings{
|
||||
DriverName: model.NewString(model.ImageDriverLocal),
|
||||
Directory: model.NewString("/path/to/directory"),
|
||||
PublicLinkSalt: model.NewString("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
DriverName: model.NewPointer(model.ImageDriverLocal),
|
||||
Directory: model.NewPointer("/path/to/directory"),
|
||||
PublicLinkSalt: model.NewPointer("abcdefghijklmnopqrstuvwxyz0123456789"),
|
||||
},
|
||||
LocalizationSettings: model.LocalizationSettings{
|
||||
DefaultServerLocale: model.NewString("garbage"),
|
||||
DefaultClientLocale: model.NewString("garbage"),
|
||||
DefaultServerLocale: model.NewPointer("garbage"),
|
||||
DefaultClientLocale: model.NewPointer("garbage"),
|
||||
},
|
||||
}
|
||||
ldapConfig = &model.Config{
|
||||
LdapSettings: model.LdapSettings{
|
||||
BindPassword: model.NewString("password"),
|
||||
BindPassword: model.NewPointer("password"),
|
||||
},
|
||||
}
|
||||
testConfig = &model.Config{
|
||||
ServiceSettings: model.ServiceSettings{
|
||||
SiteURL: model.NewString("http://TestStoreNew"),
|
||||
SiteURL: model.NewPointer("http://TestStoreNew"),
|
||||
},
|
||||
}
|
||||
customConfigDefaults = &model.Config{
|
||||
ServiceSettings: model.ServiceSettings{
|
||||
SiteURL: model.NewString("http://custom.com"),
|
||||
SiteURL: model.NewPointer("http://custom.com"),
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -110,7 +110,7 @@ func TestMergeConfigs(t *testing.T) {
|
||||
base := &model.Config{}
|
||||
base.SetDefaults()
|
||||
patch := base.Clone()
|
||||
patch.ServiceSettings.SiteURL = model.NewString("http://newhost.ca")
|
||||
patch.ServiceSettings.SiteURL = model.NewPointer("http://newhost.ca")
|
||||
|
||||
merged, err := Merge(base, patch, nil)
|
||||
require.NoError(t, err)
|
||||
@@ -122,12 +122,12 @@ func TestMergeConfigs(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)
|
||||
patch.ServiceSettings.SiteURL = model.NewPointer("http://newhost.ca")
|
||||
patch.GoogleSettings.Enable = model.NewPointer(true)
|
||||
|
||||
expected := base.Clone()
|
||||
expected.ServiceSettings.SiteURL = model.NewString("http://newhost.ca")
|
||||
expected.GoogleSettings.Enable = model.NewBool(true)
|
||||
expected.ServiceSettings.SiteURL = model.NewPointer("http://newhost.ca")
|
||||
expected.GoogleSettings.Enable = model.NewPointer(true)
|
||||
|
||||
merged, err := Merge(base, patch, nil)
|
||||
require.NoError(t, err)
|
||||
@@ -144,7 +144,7 @@ func TestConfigEnvironmentOverrides(t *testing.T) {
|
||||
base, err := NewStoreFromBacking(memstore, nil, false)
|
||||
require.NoError(t, err)
|
||||
originalConfig := &model.Config{}
|
||||
originalConfig.ServiceSettings.SiteURL = model.NewString("http://notoverridden.ca")
|
||||
originalConfig.ServiceSettings.SiteURL = model.NewPointer("http://notoverridden.ca")
|
||||
|
||||
os.Setenv("MM_SERVICESETTINGS_SITEURL", "http://overridden.ca")
|
||||
defer os.Unsetenv("MM_SERVICESETTINGS_SITEURL")
|
||||
|
||||
Ссылка в новой задаче
Block a user