Pre-package Playbooks 1.20.0 (#18477)

Automatic Merge

model/config.go

@@ -2703,7 +2703,7 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
 		s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics}
 	}
 
-	if s.PluginStates["playbooks"] == nil && BuildEnterpriseReady == "true" {
+	if s.PluginStates["playbooks"] == nil {
 		// Enable the playbooks plugin by default
 		s.PluginStates["playbooks"] = &PluginState{Enable: true}
 	}

model/config_test.go

@@ -308,7 +308,7 @@ func TestConfigDefaultNPSPluginState(t *testing.T) {
 	})
 }
 
-func TestConfigDefaultIncidentManagementPluginState(t *testing.T) {
+func TestConfigDefaultPlaybooksPluginState(t *testing.T) {
 	t.Run("should enable Playbooks plugin by default on enterprise-ready builds", func(t *testing.T) {
 		BuildEnterpriseReady = "true"
 		c1 := Config{}
@@ -317,15 +317,15 @@ func TestConfigDefaultIncidentManagementPluginState(t *testing.T) {
 		assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable)
 	})
 
-	t.Run("should not enable Playbooks plugin by default on non-enterprise-ready builds", func(t *testing.T) {
+	t.Run("should enable Playbooks plugin by default on non-enterprise-ready builds", func(t *testing.T) {
 		BuildEnterpriseReady = ""
 		c1 := Config{}
 		c1.SetDefaults()
 
-		assert.Nil(t, c1.PluginSettings.PluginStates["playbooks"])
+		assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable)
 	})
 
-	t.Run("should not re-enable IncidentManagement plugin after it has been disabled", func(t *testing.T) {
+	t.Run("should not re-enable Playbooks plugin after it has been disabled", func(t *testing.T) {
 		BuildEnterpriseReady = ""
 		c1 := Config{
 			PluginSettings: PluginSettings{

model/feature_flags.go

@@ -29,10 +29,9 @@ type FeatureFlags struct {
 	AppsEnabled bool
 
 	// Feature flags to control plugin versions
-	PluginIncidentManagement string `plugin_id:"com.mattermost.plugin-incident-management"`
-	PluginPlaybooks          string `plugin_id:"playbooks"`
-	PluginApps               string `plugin_id:"com.mattermost.apps"`
-	PluginFocalboard         string `plugin_id:"focalboard"`
+	PluginPlaybooks  string `plugin_id:"playbooks"`
+	PluginApps       string `plugin_id:"com.mattermost.apps"`
+	PluginFocalboard string `plugin_id:"focalboard"`
 
 	// Enable timed dnd support for user status
 	TimedDND bool
@@ -59,7 +58,6 @@ func (f *FeatureFlags) SetDefaults() {
 	f.CollapsedThreads = true
 	f.EnableRemoteClusterService = false
 	f.AppsEnabled = false
-	f.PluginIncidentManagement = "1.16.1"
 	f.PluginApps = ""
 	f.PluginFocalboard = ""
 	f.TimedDND = false