Merge branch 'plugins-2'

model/bundle_info.go

@@ -3,6 +3,8 @@
 
 package model
 
+import "github.com/mattermost/mattermost-server/mlog"
+
 type BundleInfo struct {
 	Path string
 
@@ -11,6 +13,13 @@ type BundleInfo struct {
 	ManifestError error
 }
 
+func (b *BundleInfo) WrapLogger(logger *mlog.Logger) *mlog.Logger {
+	if b.Manifest != nil {
+		return logger.With(mlog.String("plugin_id", b.Manifest.Id))
+	}
+	return logger.With(mlog.String("plugin_path", b.Path))
+}
+
 // Returns bundle info for the given path. The return value is never nil.
 func BundleInfoForPath(path string) *BundleInfo {
 	m, mpath, err := FindManifest(path)

model/client4.go

@@ -3701,8 +3701,8 @@ func (c *Client4) GetWebappPlugins() ([]*Manifest, *Response) {
 
 // ActivatePlugin will activate an plugin installed.
 // WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) ActivatePlugin(id string) (bool, *Response) {
-	if r, err := c.DoApiPost(c.GetPluginRoute(id)+"/activate", ""); err != nil {
+func (c *Client4) EnablePlugin(id string) (bool, *Response) {
+	if r, err := c.DoApiPost(c.GetPluginRoute(id)+"/enable", ""); err != nil {
 		return false, BuildErrorResponse(r, err)
 	} else {
 		defer closeBody(r)
@@ -3712,8 +3712,8 @@ func (c *Client4) ActivatePlugin(id string) (bool, *Response) {
 
 // DeactivatePlugin will deactivate an active plugin.
 // WARNING: PLUGINS ARE STILL EXPERIMENTAL. THIS FUNCTION IS SUBJECT TO CHANGE.
-func (c *Client4) DeactivatePlugin(id string) (bool, *Response) {
-	if r, err := c.DoApiPost(c.GetPluginRoute(id)+"/deactivate", ""); err != nil {
+func (c *Client4) DisablePlugin(id string) (bool, *Response) {
+	if r, err := c.DoApiPost(c.GetPluginRoute(id)+"/disable", ""); err != nil {
 		return false, BuildErrorResponse(r, err)
 	} else {
 		defer closeBody(r)

model/config.go

@@ -1727,7 +1727,7 @@ type PluginSettings struct {
 	EnableUploads   *bool
 	Directory       *string
 	ClientDirectory *string
-	Plugins         map[string]interface{}
+	Plugins         map[string]map[string]interface{}
 	PluginStates    map[string]*PluginState
 }
 
@@ -1757,7 +1757,7 @@ func (s *PluginSettings) SetDefaults() {
 	}
 
 	if s.Plugins == nil {
-		s.Plugins = make(map[string]interface{})
+		s.Plugins = make(map[string]map[string]interface{})
 	}
 
 	if s.PluginStates == nil {

model/plugin_status.go

@@ -10,24 +10,22 @@ import (
 
 const (
 	PluginStateNotRunning          = 0
-	PluginStateStarting            = 1
+	PluginStateStarting            = 1 // unused by server
 	PluginStateRunning             = 2
 	PluginStateFailedToStart       = 3
-	PluginStateFailedToStayRunning = 4
-	PluginStateStopping            = 5
+	PluginStateFailedToStayRunning = 4 // unused by server
+	PluginStateStopping            = 5 // unused by server
 )
 
 // PluginStatus provides a cluster-aware view of installed plugins.
 type PluginStatus struct {
-	PluginId      string `json:"plugin_id"`
-	ClusterId     string `json:"cluster_id"`
-	PluginPath    string `json:"plugin_path"`
-	State         int    `json:"state"`
-	IsSandboxed   bool   `json:"is_sandboxed"`
-	IsPrepackaged bool   `json:"is_prepackaged"`
-	Name          string `json:"name"`
-	Description   string `json:"description"`
-	Version       string `json:"version"`
+	PluginId    string `json:"plugin_id"`
+	ClusterId   string `json:"cluster_id"`
+	PluginPath  string `json:"plugin_path"`
+	State       int    `json:"state"`
+	Name        string `json:"name"`
+	Description string `json:"description"`
+	Version     string `json:"version"`
 }
 
 type PluginStatuses []*PluginStatus

model/plugins_response.go

@@ -10,7 +10,6 @@ import (
 
 type PluginInfo struct {
 	Manifest
-	Prepackaged bool `json:"prepackaged"`
 }
 
 type PluginsResponse struct {

model/websocket_message.go

@@ -44,9 +44,9 @@ const (
 	WEBSOCKET_EVENT_RESPONSE                = "response"
 	WEBSOCKET_EVENT_EMOJI_ADDED             = "emoji_added"
 	WEBSOCKET_EVENT_CHANNEL_VIEWED          = "channel_viewed"
-	WEBSOCKET_EVENT_PLUGIN_ACTIVATED        = "plugin_activated"        // EXPERIMENTAL - SUBJECT TO CHANGE
-	WEBSOCKET_EVENT_PLUGIN_DEACTIVATED      = "plugin_deactivated"      // EXPERIMENTAL - SUBJECT TO CHANGE
-	WEBSOCKET_EVENT_PLUGIN_STATUSES_CHANGED = "plugin_statuses_changed" // EXPERIMENTAL - SUBJECT TO CHANGE
+	WEBSOCKET_EVENT_PLUGIN_STATUSES_CHANGED = "plugin_statuses_changed"
+	WEBSOCKET_EVENT_PLUGIN_ENABLED          = "plugin_enabled"
+	WEBSOCKET_EVENT_PLUGIN_DISABLED         = "plugin_disabled"
 	WEBSOCKET_EVENT_ROLE_UPDATED            = "role_updated"
 	WEBSOCKET_EVENT_LICENSE_CHANGED         = "license_changed"
 	WEBSOCKET_EVENT_CONFIG_CHANGED          = "config_changed"