From 46a693e421d61b4a107d7796edc6f0edf94ade9a Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Wed, 1 Mar 2023 17:17:23 -0500 Subject: [PATCH 1/3] Add in-product expansion config. --- model/config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/model/config.go b/model/config.go index 2e76ee3d59..ea72e92077 100644 --- a/model/config.go +++ b/model/config.go @@ -385,6 +385,7 @@ type ServiceSettings struct { EnableCustomGroups *bool `access:"site_users_and_teams"` SelfHostedPurchase *bool `access:"write_restrictable,cloud_restrictable"` AllowSyncedDrafts *bool `access:"site_posts"` + InProductExpansion *bool `access:"write_restrictable,cloud_restrictable"` } func (s *ServiceSettings) SetDefaults(isUpdate bool) { @@ -857,6 +858,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { if s.SelfHostedPurchase == nil { s.SelfHostedPurchase = NewBool(true) } + + if s.InProductExpansion == nil { + s.InProductExpansion = NewBool(false) + } } type ClusterSettings struct { From 27b49983fd8723332f1a35871ea24882e3655461 Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Thu, 2 Mar 2023 10:02:14 -0500 Subject: [PATCH 2/3] use in product expansion setting in telemetry --- services/telemetry/telemetry.go | 1 + 1 file changed, 1 insertion(+) diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 0e17033d86..928d50e23a 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -460,6 +460,7 @@ func (ts *TelemetryService) trackConfig() { "post_priority": *cfg.ServiceSettings.PostPriority, "self_hosted_purchase": *cfg.ServiceSettings.SelfHostedPurchase, "allow_synced_drafts": *cfg.ServiceSettings.AllowSyncedDrafts, + "in_product_expansion": *cfg.ServiceSettings.InProductExpansion, }) ts.SendTelemetry(TrackConfigTeam, map[string]any{ From 871f35326ce589de0ab4cadeff1f43121c6054c3 Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Thu, 2 Mar 2023 15:07:56 -0500 Subject: [PATCH 3/3] change config name to self hosted expansion to follow suit with self hosted purchase. --- model/config.go | 6 +++--- services/telemetry/telemetry.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/model/config.go b/model/config.go index ea72e92077..835d02e477 100644 --- a/model/config.go +++ b/model/config.go @@ -385,7 +385,7 @@ type ServiceSettings struct { EnableCustomGroups *bool `access:"site_users_and_teams"` SelfHostedPurchase *bool `access:"write_restrictable,cloud_restrictable"` AllowSyncedDrafts *bool `access:"site_posts"` - InProductExpansion *bool `access:"write_restrictable,cloud_restrictable"` + SelfHostedExpansion *bool `access:"write_restrictable,cloud_restrictable"` } func (s *ServiceSettings) SetDefaults(isUpdate bool) { @@ -859,8 +859,8 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) { s.SelfHostedPurchase = NewBool(true) } - if s.InProductExpansion == nil { - s.InProductExpansion = NewBool(false) + if s.SelfHostedExpansion == nil { + s.SelfHostedExpansion = NewBool(false) } } diff --git a/services/telemetry/telemetry.go b/services/telemetry/telemetry.go index 928d50e23a..5554da8d2d 100644 --- a/services/telemetry/telemetry.go +++ b/services/telemetry/telemetry.go @@ -460,7 +460,7 @@ func (ts *TelemetryService) trackConfig() { "post_priority": *cfg.ServiceSettings.PostPriority, "self_hosted_purchase": *cfg.ServiceSettings.SelfHostedPurchase, "allow_synced_drafts": *cfg.ServiceSettings.AllowSyncedDrafts, - "in_product_expansion": *cfg.ServiceSettings.InProductExpansion, + "self_hosted_expansion": *cfg.ServiceSettings.SelfHostedExpansion, }) ts.SendTelemetry(TrackConfigTeam, map[string]any{