MM-13208 Rename DisablePostMetadata setting to EnablePostMetadata and turn off by default (#9894)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
514c1f1617
Коммит
4294758793
@@ -494,6 +494,7 @@ func (a *App) trackConfig() {
|
|||||||
a.SendDiagnostic(TRACK_CONFIG_EXPERIMENTAL, map[string]interface{}{
|
a.SendDiagnostic(TRACK_CONFIG_EXPERIMENTAL, map[string]interface{}{
|
||||||
"client_side_cert_enable": *cfg.ExperimentalSettings.ClientSideCertEnable,
|
"client_side_cert_enable": *cfg.ExperimentalSettings.ClientSideCertEnable,
|
||||||
"isdefault_client_side_cert_check": isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.CLIENT_SIDE_CERT_CHECK_PRIMARY_AUTH),
|
"isdefault_client_side_cert_check": isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.CLIENT_SIDE_CERT_CHECK_PRIMARY_AUTH),
|
||||||
|
"enable_post_metadata": *cfg.ExperimentalSettings.EnablePostMetadata,
|
||||||
})
|
})
|
||||||
|
|
||||||
a.SendDiagnostic(TRACK_CONFIG_ANALYTICS, map[string]interface{}{
|
a.SendDiagnostic(TRACK_CONFIG_ANALYTICS, map[string]interface{}{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ func (a *App) PreparePostForClient(originalPost *model.Post) *model.Post {
|
|||||||
// Proxy image links before constructing metadata so that requests go through the proxy
|
// Proxy image links before constructing metadata so that requests go through the proxy
|
||||||
post = a.PostWithProxyAddedToImageURLs(post)
|
post = a.PostWithProxyAddedToImageURLs(post)
|
||||||
|
|
||||||
if *a.Config().ExperimentalSettings.DisablePostMetadata {
|
if !*a.Config().ExperimentalSettings.EnablePostMetadata {
|
||||||
return post
|
return post
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ func TestPreparePostListForClient(t *testing.T) {
|
|||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||||
*cfg.ExperimentalSettings.DisablePostMetadata = false
|
*cfg.ExperimentalSettings.EnablePostMetadata = true
|
||||||
})
|
})
|
||||||
|
|
||||||
postList := model.NewPostList()
|
postList := model.NewPostList()
|
||||||
@@ -61,7 +61,7 @@ func TestPreparePostForClient(t *testing.T) {
|
|||||||
*cfg.ServiceSettings.ImageProxyType = ""
|
*cfg.ServiceSettings.ImageProxyType = ""
|
||||||
*cfg.ServiceSettings.ImageProxyURL = ""
|
*cfg.ServiceSettings.ImageProxyURL = ""
|
||||||
*cfg.ServiceSettings.ImageProxyOptions = ""
|
*cfg.ServiceSettings.ImageProxyOptions = ""
|
||||||
*cfg.ExperimentalSettings.DisablePostMetadata = false
|
*cfg.ExperimentalSettings.EnablePostMetadata = true
|
||||||
})
|
})
|
||||||
|
|
||||||
return th
|
return th
|
||||||
@@ -395,7 +395,7 @@ func TestPreparePostForClient(t *testing.T) {
|
|||||||
defer th.TearDown()
|
defer th.TearDown()
|
||||||
|
|
||||||
th.App.UpdateConfig(func(cfg *model.Config) {
|
th.App.UpdateConfig(func(cfg *model.Config) {
|
||||||
*cfg.ExperimentalSettings.DisablePostMetadata = true
|
*cfg.ExperimentalSettings.EnablePostMetadata = false
|
||||||
})
|
})
|
||||||
|
|
||||||
post := th.CreatePost(th.BasicChannel)
|
post := th.CreatePost(th.BasicChannel)
|
||||||
@@ -418,7 +418,7 @@ func TestPreparePostForClientWithImageProxy(t *testing.T) {
|
|||||||
*cfg.ServiceSettings.ImageProxyType = "atmos/camo"
|
*cfg.ServiceSettings.ImageProxyType = "atmos/camo"
|
||||||
*cfg.ServiceSettings.ImageProxyURL = "https://127.0.0.1"
|
*cfg.ServiceSettings.ImageProxyURL = "https://127.0.0.1"
|
||||||
*cfg.ServiceSettings.ImageProxyOptions = "foo"
|
*cfg.ServiceSettings.ImageProxyOptions = "foo"
|
||||||
*cfg.ExperimentalSettings.DisablePostMetadata = false
|
*cfg.ExperimentalSettings.EnablePostMetadata = true
|
||||||
})
|
})
|
||||||
|
|
||||||
return th
|
return th
|
||||||
|
|||||||
@@ -361,7 +361,7 @@
|
|||||||
"ExperimentalSettings": {
|
"ExperimentalSettings": {
|
||||||
"ClientSideCertEnable": false,
|
"ClientSideCertEnable": false,
|
||||||
"ClientSideCertCheck": "secondary",
|
"ClientSideCertCheck": "secondary",
|
||||||
"DisablePostMetadata": false
|
"EnablePostMetadata": false
|
||||||
},
|
},
|
||||||
"AnalyticsSettings": {
|
"AnalyticsSettings": {
|
||||||
"MaxUsersForStatistics": 2500
|
"MaxUsersForStatistics": 2500
|
||||||
|
|||||||
@@ -651,7 +651,7 @@ func (s *MetricsSettings) SetDefaults() {
|
|||||||
type ExperimentalSettings struct {
|
type ExperimentalSettings struct {
|
||||||
ClientSideCertEnable *bool
|
ClientSideCertEnable *bool
|
||||||
ClientSideCertCheck *string
|
ClientSideCertCheck *string
|
||||||
DisablePostMetadata *bool
|
EnablePostMetadata *bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ExperimentalSettings) SetDefaults() {
|
func (s *ExperimentalSettings) SetDefaults() {
|
||||||
@@ -663,8 +663,8 @@ func (s *ExperimentalSettings) SetDefaults() {
|
|||||||
s.ClientSideCertCheck = NewString(CLIENT_SIDE_CERT_CHECK_SECONDARY_AUTH)
|
s.ClientSideCertCheck = NewString(CLIENT_SIDE_CERT_CHECK_SECONDARY_AUTH)
|
||||||
}
|
}
|
||||||
|
|
||||||
if s.DisablePostMetadata == nil {
|
if s.EnablePostMetadata == nil {
|
||||||
s.DisablePostMetadata = NewBool(false)
|
s.EnablePostMetadata = NewBool(false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user