From 285de459880d77fea48a2bbf6e20ef3b08284754 Mon Sep 17 00:00:00 2001 From: Ben Cooke Date: Wed, 28 Jul 2021 08:53:17 -0400 Subject: [PATCH] [MM-37278] Removing data retention feature flag (#17992) * removing feature flag Co-authored-by: Benjamin Cooke Co-authored-by: Mattermod --- go.tools.mod | 2 +- go.tools.sum | 2 ++ i18n/en.json | 20 -------------------- model/feature_flags.go | 5 ----- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/go.tools.mod b/go.tools.mod index d19172a283..545c5caf09 100644 --- a/go.tools.mod +++ b/go.tools.mod @@ -7,7 +7,7 @@ require ( github.com/golang-migrate/migrate/v4 v4.14.1 // indirect github.com/jstemmer/go-junit-report v0.9.1 // indirect github.com/jteeuwen/go-bindata v3.0.7+incompatible // indirect - github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210714114450-fbc82c4cf833 // indirect + github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210721133912-8b250bf4d0f6 // indirect github.com/philhofer/fwd v1.0.0 // indirect github.com/reflog/struct2interface v0.6.1 // indirect github.com/spf13/cobra v1.1.3 // indirect diff --git a/go.tools.sum b/go.tools.sum index 0315b51c12..7c473a0c19 100644 --- a/go.tools.sum +++ b/go.tools.sum @@ -346,6 +346,8 @@ github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210309083648-c1e557 github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210309083648-c1e5575135f9/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM= github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210714114450-fbc82c4cf833 h1:Cgx5Md/4umqKYAgu8oPTZ+vDPZ5DaaRpjUjR+CUsmNI= github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210714114450-fbc82c4cf833/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM= +github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210721133912-8b250bf4d0f6 h1:G/PSgH19gSY1cMhFeUQzrrJ164PJ5OAW8ghyupR95qg= +github.com/mattermost/mattermost-utilities/mmgotool v0.0.0-20210721133912-8b250bf4d0f6/go.mod h1:3gKozJI8n2Y/vW37GfnFWAdehGXe5yZlt+HykK6Y3DM= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= diff --git a/i18n/en.json b/i18n/en.json index c18e8298af..6953877604 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -6934,18 +6934,6 @@ "id": "ent.compliance.run_failed.error", "translation": "Compliance export failed for job '{{.JobName}}' at '{{.FilePath}}'" }, - { - "id": "ent.data_retention.channel_member_history_batch.internal_error", - "translation": "Failed to purge records." - }, - { - "id": "ent.data_retention.file_infos_batch.internal_error", - "translation": "We encountered an error permanently deleting the batch of file infos." - }, - { - "id": "ent.data_retention.flags_batch.internal_error", - "translation": "We encountered an error cleaning up the batch of flags." - }, { "id": "ent.data_retention.generic.license.error", "translation": "Your license does not support Data Retention." @@ -6958,14 +6946,6 @@ "id": "ent.data_retention.policies.invalid_policy", "translation": "Policy is invalid." }, - { - "id": "ent.data_retention.posts_permanent_delete_batch.internal_error", - "translation": "We encountered an error permanently deleting the batch of posts." - }, - { - "id": "ent.data_retention.reactions_batch.internal_error", - "translation": "We encountered an error permanently deleting the batch of reactions." - }, { "id": "ent.data_retention.run_failed.error", "translation": "Data retention job failed." diff --git a/model/feature_flags.go b/model/feature_flags.go index 646a055206..de23d04601 100644 --- a/model/feature_flags.go +++ b/model/feature_flags.go @@ -33,9 +33,6 @@ type FeatureFlags struct { PluginApps string `plugin_id:"com.mattermost.apps"` PluginFocalboard string `plugin_id:"focalboard"` - // Control support for custom data retention policies - CustomDataRetentionEnabled bool - // Enable timed dnd support for user status TimedDND bool @@ -50,11 +47,9 @@ func (f *FeatureFlags) SetDefaults() { f.CollapsedThreads = true f.EnableRemoteClusterService = false f.AppsEnabled = false - f.PluginIncidentManagement = "1.14.3" f.PluginApps = "" f.PluginFocalboard = "" - f.CustomDataRetentionEnabled = false f.TimedDND = false f.GlobalHeader = false }