From c8fa4ac1179ef5911751dea68392e3107d011c42 Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Mon, 8 Feb 2021 16:31:13 -0400
Subject: [PATCH] pre-package incident management v1.3.2 (#16875)

* pre-package incident management v1.3.2

* feature flags

* use repository name, not plugin id, in PLUGIN_PACKAGES

* disable remote marketplace in tests

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
---
 Makefile               | 2 +-
 app/plugin_test.go     | 5 +++++
 model/feature_flags.go | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7788327248..e6ac842fe6 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ PLUGIN_PACKAGES += mattermost-plugin-channel-export-v0.2.2
 PLUGIN_PACKAGES += mattermost-plugin-custom-attributes-v1.3.0
 PLUGIN_PACKAGES += mattermost-plugin-github-v2.0.0
 PLUGIN_PACKAGES += mattermost-plugin-gitlab-v1.3.0
-PLUGIN_PACKAGES += mattermost-plugin-incident-management-v1.3.1
+PLUGIN_PACKAGES += mattermost-plugin-incident-collaboration-v1.3.2
 PLUGIN_PACKAGES += mattermost-plugin-jenkins-v1.1.0
 PLUGIN_PACKAGES += mattermost-plugin-jira-v2.4.0
 PLUGIN_PACKAGES += mattermost-plugin-nps-v1.1.0
diff --git a/app/plugin_test.go b/app/plugin_test.go
index 34a86a4bf3..4f6c4be75f 100644
--- a/app/plugin_test.go
+++ b/app/plugin_test.go
@@ -769,6 +769,7 @@ func TestProcessPrepackagedPlugins(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = true
 			*cfg.PluginSettings.AutomaticPrepackagedPlugins = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
 		})
 
 		plugins := th.App.processPrepackagedPlugins(prepackagedPluginsDir)
@@ -793,6 +794,7 @@ func TestProcessPrepackagedPlugins(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = true
 			*cfg.PluginSettings.AutomaticPrepackagedPlugins = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
 		})
 
 		env := th.App.GetPluginsEnvironment()
@@ -811,6 +813,7 @@ func TestProcessPrepackagedPlugins(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = true
 			*cfg.PluginSettings.AutomaticPrepackagedPlugins = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
 		})
 
 		env := th.App.GetPluginsEnvironment()
@@ -845,6 +848,7 @@ func TestProcessPrepackagedPlugins(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = true
 			*cfg.PluginSettings.AutomaticPrepackagedPlugins = true
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
 		})
 
 		env := th.App.GetPluginsEnvironment()
@@ -901,6 +905,7 @@ func TestProcessPrepackagedPlugins(t *testing.T) {
 		th.App.UpdateConfig(func(cfg *model.Config) {
 			*cfg.PluginSettings.Enable = true
 			*cfg.PluginSettings.AutomaticPrepackagedPlugins = false
+			*cfg.PluginSettings.EnableRemoteMarketplace = false
 		})
 
 		env := th.App.GetPluginsEnvironment()
diff --git a/model/feature_flags.go b/model/feature_flags.go
index 7eed06c5ba..0c8d670449 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -27,7 +27,7 @@ func (f *FeatureFlags) SetDefaults() {
 	f.TestBoolFeature = false
 	f.CloudDelinquentEmailJobsEnabled = false
 	f.CollapsedThreads = false
-	f.PluginIncidentManagement = "1.1.1"
+	f.PluginIncidentManagement = "1.3.2"
 }
 
 func (f *FeatureFlags) Plugins() map[string]string {