channel/plugin.go: UpsertPlugins(): use filename as type

- The Upsert() func is no longer required because Info{} contains all that properties.
- Fix reciver param name of Info.TableName() method.
- Remove type from GetInfo to make it non-configurable. The file name should always be used as the type.

cmd/channel/email/main.go

@@ -119,7 +119,6 @@ func (ch *Email) GetInfo() *plugin.Info {
 	}
 
 	return &plugin.Info{
-		Type:             "email",
 		Name:             "Email",
 		Version:          internal.Version.Version,
 		Author:           "Icinga GmbH",

cmd/channel/rocketchat/main.go

@@ -118,7 +118,6 @@ func (ch *RocketChat) GetInfo() *plugin.Info {
 	}
 
 	return &plugin.Info{
-		Type:             "rocketchat",
 		Name:             "Rocket.Chat",
 		Version:          internal.Version.Version,
 		Author:           "Icinga GmbH",

internal/channel/plugin.go

@@ -172,6 +172,7 @@ func UpsertPlugins(channelPluginDir string, logger *logging.Logger, db *icingadb
 			continue
 		}
 		p.Stop()
+		info.Type = pluginType
 
 		pluginTypes = append(pluginTypes, pluginType)
 		pluginInfos = append(pluginInfos, info)

pkg/plugin/plugin.go

@@ -66,28 +66,18 @@ type ConfigOption struct {
 
 // Info contains plugin information.
 type Info struct {
-	Type             string          `db:"type" json:"type"`
+	Type             string          `db:"type" json:"-"`
 	Name             string          `db:"name" json:"name"`
 	Version          string          `db:"version" json:"version"`
 	Author           string          `db:"author" json:"author"`
 	ConfigAttributes json.RawMessage `db:"config_attrs" json:"config_attrs"` // ConfigOption(s) as json-encoded list
 }
 
 // TableName implements the contracts.TableNamer interface.
-func (c *Info) TableName() string {
+func (i *Info) TableName() string {
 	return "available_channel_type"
 }
 
-// Upsert implements the contracts.Upserter interface.
-func (c *Info) Upsert() interface{} {
-	return struct {
-		Name             string          `db:"name"`
-		Version          string          `db:"version"`
-		Author           string          `db:"author"`
-		ConfigAttributes json.RawMessage `db:"config_attrs"`
-	}{}
-}
-
 type Contact struct {
 	FullName  string     `json:"full_name"`
 	Addresses []*Address `json:"addresses"`