Adds ConnectedWorkspacesSettings configuration block (#27820)
* Adds ServerFederationSettings configuration block The Server Federation related configuration properties were located in the `ExperimentalSettings` config block. Now that the feature is going to get out of beta, and foreseeing more configuration properties being added to it, we're moving them to a block of its own. If the properties were set in the old location, their values should be carried over to the new ones. The old properties are left in place and marked as deprecated not to cause issues with the model. * Update System Console to include Server Federation section * Remove system console section * Move the configuration properties to ConnectedWorkspaces * Add ConnectedWorkspacesSettings to the telemetry --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
0c585bdac6
Коммит
d5e9aa9fb3
@@ -212,7 +212,7 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent
|
||||
}
|
||||
|
||||
func getLicense(enterprise bool, cfg *model.Config) *model.License {
|
||||
if *cfg.ExperimentalSettings.EnableRemoteClusterService || *cfg.ExperimentalSettings.EnableSharedChannels {
|
||||
if *cfg.ConnectedWorkspacesSettings.EnableRemoteClusterService || *cfg.ConnectedWorkspacesSettings.EnableSharedChannels {
|
||||
return model.NewTestLicenseSKU(model.LicenseShortSkuProfessional)
|
||||
}
|
||||
if enterprise {
|
||||
|
||||
@@ -24,8 +24,8 @@ var (
|
||||
|
||||
func setupForSharedChannels(tb testing.TB) *TestHelper {
|
||||
th := SetupConfig(tb, func(cfg *model.Config) {
|
||||
*cfg.ExperimentalSettings.EnableRemoteClusterService = true
|
||||
*cfg.ExperimentalSettings.EnableSharedChannels = true
|
||||
*cfg.ConnectedWorkspacesSettings.EnableRemoteClusterService = true
|
||||
*cfg.ConnectedWorkspacesSettings.EnableSharedChannels = true
|
||||
})
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||
|
||||
@@ -145,7 +145,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo
|
||||
}
|
||||
|
||||
func getLicense(enterprise bool, cfg *model.Config) *model.License {
|
||||
if *cfg.ExperimentalSettings.EnableRemoteClusterService || *cfg.ExperimentalSettings.EnableSharedChannels {
|
||||
if *cfg.ConnectedWorkspacesSettings.EnableRemoteClusterService || *cfg.ConnectedWorkspacesSettings.EnableSharedChannels {
|
||||
return model.NewTestLicenseSKU(model.LicenseShortSkuProfessional)
|
||||
}
|
||||
if enterprise {
|
||||
|
||||
@@ -15,7 +15,7 @@ import (
|
||||
|
||||
func setupRemoteCluster(tb testing.TB) *TestHelper {
|
||||
return SetupConfig(tb, func(cfg *model.Config) {
|
||||
*cfg.ExperimentalSettings.EnableRemoteClusterService = true
|
||||
*cfg.ConnectedWorkspacesSettings.EnableRemoteClusterService = true
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -589,7 +589,7 @@ func (s *Server) startInterClusterServices(license *model.License) error {
|
||||
}
|
||||
|
||||
// Config check
|
||||
if !*s.platform.Config().ExperimentalSettings.EnableRemoteClusterService && !*s.platform.Config().ExperimentalSettings.EnableSharedChannels {
|
||||
if !*s.platform.Config().ConnectedWorkspacesSettings.EnableRemoteClusterService && !*s.platform.Config().ConnectedWorkspacesSettings.EnableSharedChannels {
|
||||
mlog.Debug("Remote Cluster Service disabled via config")
|
||||
return nil
|
||||
}
|
||||
@@ -618,7 +618,7 @@ func (s *Server) startInterClusterServices(license *model.License) error {
|
||||
}
|
||||
|
||||
// Config check
|
||||
if !*s.platform.Config().ExperimentalSettings.EnableSharedChannels {
|
||||
if !*s.platform.Config().ConnectedWorkspacesSettings.EnableSharedChannels {
|
||||
mlog.Debug("Shared Channels Service disabled via config")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -14,8 +14,8 @@ import (
|
||||
|
||||
func setupSharedChannels(tb testing.TB) *TestHelper {
|
||||
return SetupConfig(tb, func(cfg *model.Config) {
|
||||
*cfg.ExperimentalSettings.EnableRemoteClusterService = true
|
||||
*cfg.ExperimentalSettings.EnableSharedChannels = true
|
||||
*cfg.ConnectedWorkspacesSettings.EnableRemoteClusterService = true
|
||||
*cfg.ConnectedWorkspacesSettings.EnableSharedChannels = true
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ import (
|
||||
|
||||
func setupForSharedChannels(tb testing.TB) *TestHelper {
|
||||
return setupConfig(tb, func(cfg *model.Config) {
|
||||
*cfg.ExperimentalSettings.EnableRemoteClusterService = true
|
||||
*cfg.ExperimentalSettings.EnableSharedChannels = true
|
||||
*cfg.ConnectedWorkspacesSettings.EnableRemoteClusterService = true
|
||||
*cfg.ConnectedWorkspacesSettings.EnableSharedChannels = true
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -138,7 +138,7 @@ func setupTestHelper(dbStore store.Store, enterprise bool, includeCacheLayer boo
|
||||
}
|
||||
|
||||
func getLicense(enterprise bool, cfg *model.Config) *model.License {
|
||||
if *cfg.ExperimentalSettings.EnableRemoteClusterService || *cfg.ExperimentalSettings.EnableSharedChannels {
|
||||
if *cfg.ConnectedWorkspacesSettings.EnableRemoteClusterService || *cfg.ConnectedWorkspacesSettings.EnableSharedChannels {
|
||||
return model.NewTestLicenseSKU(model.LicenseShortSkuProfessional)
|
||||
}
|
||||
if enterprise {
|
||||
|
||||
Ссылка в новой задаче
Block a user