diff --git a/Makefile b/Makefile index 5001f7d9ea..707b4fa31a 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,7 @@ PLUGIN_PACKAGES += mattermost-plugin-antivirus-v0.1.2 PLUGIN_PACKAGES += mattermost-plugin-jira-v2.3.2 PLUGIN_PACKAGES += mattermost-plugin-gitlab-v1.1.0 PLUGIN_PACKAGES += mattermost-plugin-jenkins-v1.0.0 +PLUGIN_PACKAGES += mattermost-plugin-incident-response-v0.6.0 # Prepares the enterprise build if exists. The IGNORE stuff is a hack to get the Makefile to execute the commands outside a target ifeq ($(BUILD_ENTERPRISE_READY),true) diff --git a/model/config.go b/model/config.go index 30d5586cc1..7df6da4dfc 100644 --- a/model/config.go +++ b/model/config.go @@ -2580,6 +2580,11 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) { s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics} } + if s.PluginStates["com.mattermost.plugin-incident-response"] == nil { + // Enable the incident response plugin by default + s.PluginStates["com.mattermost.plugin-incident-response"] = &PluginState{Enable: true} + } + if s.EnableMarketplace == nil { s.EnableMarketplace = NewBool(PLUGIN_SETTINGS_DEFAULT_ENABLE_MARKETPLACE) } diff --git a/model/config_test.go b/model/config_test.go index 92bd32e46c..115ff49298 100644 --- a/model/config_test.go +++ b/model/config_test.go @@ -307,6 +307,31 @@ func TestConfigDefaultNPSPluginState(t *testing.T) { }) } +func TestConfigDefaultIncidentResponsePluginState(t *testing.T) { + t.Run("should enable IncidentResponse plugin by default", func(t *testing.T) { + c1 := Config{} + c1.SetDefaults() + + assert.True(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-response"].Enable) + }) + + t.Run("should not re-enable IncidentResponse plugin after it has been disabled", func(t *testing.T) { + c1 := Config{ + PluginSettings: PluginSettings{ + PluginStates: map[string]*PluginState{ + "com.mattermost.plugin-incident-response": { + Enable: false, + }, + }, + }, + } + + c1.SetDefaults() + + assert.False(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-response"].Enable) + }) +} + func TestTeamSettingsIsValidSiteNameEmpty(t *testing.T) { c1 := Config{} c1.SetDefaults()