MM-30800: prepackage incident management 1.1 (#16323)
* prepackage incident management v1.1 (#16195) Fixes: https://mattermost.atlassian.net/browse/MM-30800 Co-authored-by: Mattermod <mattermod@users.noreply.github.com> * update telemetry whitelist * newer version! Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
537b5a5b67
Коммит
2ac83ffac7
2
Makefile
2
Makefile
@@ -95,7 +95,7 @@ PLUGIN_PACKAGES += mattermost-plugin-antivirus-v0.1.2
|
|||||||
PLUGIN_PACKAGES += mattermost-plugin-jira-v2.3.2
|
PLUGIN_PACKAGES += mattermost-plugin-jira-v2.3.2
|
||||||
PLUGIN_PACKAGES += mattermost-plugin-gitlab-v1.1.0
|
PLUGIN_PACKAGES += mattermost-plugin-gitlab-v1.1.0
|
||||||
PLUGIN_PACKAGES += mattermost-plugin-jenkins-v1.0.0
|
PLUGIN_PACKAGES += mattermost-plugin-jenkins-v1.0.0
|
||||||
PLUGIN_PACKAGES += mattermost-plugin-incident-response-v0.6.0
|
PLUGIN_PACKAGES += mattermost-plugin-incident-management-v1.1.1
|
||||||
|
|
||||||
# Prepares the enterprise build if exists. The IGNORE stuff is a hack to get the Makefile to execute the commands outside a target
|
# 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)
|
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||||
|
|||||||
@@ -2669,9 +2669,9 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
|
|||||||
s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics}
|
s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics}
|
||||||
}
|
}
|
||||||
|
|
||||||
if s.PluginStates["com.mattermost.plugin-incident-response"] == nil {
|
if s.PluginStates["com.mattermost.plugin-incident-management"] == nil {
|
||||||
// Enable the incident response plugin by default
|
// Enable the incident management plugin by default
|
||||||
s.PluginStates["com.mattermost.plugin-incident-response"] = &PluginState{Enable: true}
|
s.PluginStates["com.mattermost.plugin-incident-management"] = &PluginState{Enable: true}
|
||||||
}
|
}
|
||||||
|
|
||||||
if s.EnableMarketplace == nil {
|
if s.EnableMarketplace == nil {
|
||||||
|
|||||||
@@ -308,19 +308,19 @@ func TestConfigDefaultNPSPluginState(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestConfigDefaultIncidentResponsePluginState(t *testing.T) {
|
func TestConfigDefaultIncidentManagementPluginState(t *testing.T) {
|
||||||
t.Run("should enable IncidentResponse plugin by default", func(t *testing.T) {
|
t.Run("should enable IncidentManagement plugin by default", func(t *testing.T) {
|
||||||
c1 := Config{}
|
c1 := Config{}
|
||||||
c1.SetDefaults()
|
c1.SetDefaults()
|
||||||
|
|
||||||
assert.True(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-response"].Enable)
|
assert.True(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-management"].Enable)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("should not re-enable IncidentResponse plugin after it has been disabled", func(t *testing.T) {
|
t.Run("should not re-enable IncidentManagement plugin after it has been disabled", func(t *testing.T) {
|
||||||
c1 := Config{
|
c1 := Config{
|
||||||
PluginSettings: PluginSettings{
|
PluginSettings: PluginSettings{
|
||||||
PluginStates: map[string]*PluginState{
|
PluginStates: map[string]*PluginState{
|
||||||
"com.mattermost.plugin-incident-response": {
|
"com.mattermost.plugin-incident-management": {
|
||||||
Enable: false,
|
Enable: false,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -329,7 +329,7 @@ func TestConfigDefaultIncidentResponsePluginState(t *testing.T) {
|
|||||||
|
|
||||||
c1.SetDefaults()
|
c1.SetDefaults()
|
||||||
|
|
||||||
assert.False(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-response"].Enable)
|
assert.False(t, c1.PluginSettings.PluginStates["com.mattermost.plugin-incident-management"].Enable)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1282,7 +1282,7 @@ func (ts *TelemetryService) trackPluginConfig(cfg *model.Config, marketplaceURL
|
|||||||
"com.mattermost.custom-attributes",
|
"com.mattermost.custom-attributes",
|
||||||
"com.mattermost.mscalendar",
|
"com.mattermost.mscalendar",
|
||||||
"com.mattermost.nps",
|
"com.mattermost.nps",
|
||||||
"com.mattermost.plugin-incident-response",
|
"com.mattermost.plugin-incident-management",
|
||||||
"com.mattermost.plugin-todo",
|
"com.mattermost.plugin-todo",
|
||||||
"com.mattermost.webex",
|
"com.mattermost.webex",
|
||||||
"com.mattermost.welcomebot",
|
"com.mattermost.welcomebot",
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user