refactor: cleanup start plugin methods

Author: christophwitzko

pkg/plugin/client.go

@@ -10,12 +10,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/go-semantic-release/semantic-release/v2/pkg/analyzer"
-	"github.com/go-semantic-release/semantic-release/v2/pkg/condition"
-	"github.com/go-semantic-release/semantic-release/v2/pkg/generator"
-	"github.com/go-semantic-release/semantic-release/v2/pkg/hooks"
-	"github.com/go-semantic-release/semantic-release/v2/pkg/provider"
-	"github.com/go-semantic-release/semantic-release/v2/pkg/updater"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
 )
@@ -37,7 +31,7 @@ func KillAllPlugins() {
 	}
 }
 
-func startPlugin(opts *PluginOpts) (interface{}, error) {
+func StartPlugin(opts *PluginOpts) (interface{}, error) {
 	runningClientsMx.Lock()
 	defer runningClientsMx.Unlock()
 	logR, logW := io.Pipe()
@@ -81,51 +75,3 @@ func startPlugin(opts *PluginOpts) (interface{}, error) {
 	runningClients = append(runningClients, client)
 	return raw, nil
 }
-
-func StartCommitAnalyzerPlugin(opts *PluginOpts) (analyzer.CommitAnalyzer, error) {
-	raw, err := startPlugin(opts)
-	if err != nil {
-		return nil, err
-	}
-	return raw.(analyzer.CommitAnalyzer), nil
-}
-
-func StartCIConditionPlugin(opts *PluginOpts) (condition.CICondition, error) {
-	raw, err := startPlugin(opts)
-	if err != nil {
-		return nil, err
-	}
-	return raw.(condition.CICondition), nil
-}
-
-func StartChangelogGeneratorPlugin(opts *PluginOpts) (generator.ChangelogGenerator, error) {
-	raw, err := startPlugin(opts)
-	if err != nil {
-		return nil, err
-	}
-	return raw.(generator.ChangelogGenerator), nil
-}
-
-func StartProviderPlugin(opts *PluginOpts) (provider.Provider, error) {
-	raw, err := startPlugin(opts)
-	if err != nil {
-		return nil, err
-	}
-	return raw.(provider.Provider), nil
-}
-
-func StartFilesUpdaterPlugin(opts *PluginOpts) (updater.FilesUpdater, error) {
-	raw, err := startPlugin(opts)
-	if err != nil {
-		return nil, err
-	}
-	return raw.(updater.FilesUpdater), nil
-}
-
-func StartHooksPlugin(opts *PluginOpts) (hooks.Hooks, error) {
-	raw, err := startPlugin(opts)
-	if err != nil {
-		return nil, err
-	}
-	return raw.(hooks.Hooks), nil
-}

pkg/plugin/manager/manager.go

@@ -34,11 +34,11 @@ func (m *PluginManager) GetCICondition() (condition.CICondition, error) {
 		return nil, err
 	}
 
-	cic, err := plugin.StartCIConditionPlugin(opts)
+	cic, err := plugin.StartPlugin(opts)
 	if err != nil {
 		return nil, err
 	}
-	return cic, nil
+	return cic.(condition.CICondition), nil
 }
 
 func (m *PluginManager) GetProvider() (provider.Provider, error) {
@@ -47,11 +47,11 @@ func (m *PluginManager) GetProvider() (provider.Provider, error) {
 		return nil, err
 	}
 
-	provider, err := plugin.StartProviderPlugin(opts)
+	prov, err := plugin.StartPlugin(opts)
 	if err != nil {
 		return nil, err
 	}
-	return provider, nil
+	return prov.(provider.Provider), nil
 }
 
 func (m *PluginManager) GetCommitAnalyzer() (analyzer.CommitAnalyzer, error) {
@@ -60,11 +60,11 @@ func (m *PluginManager) GetCommitAnalyzer() (analyzer.CommitAnalyzer, error) {
 		return nil, err
 	}
 
-	ca, err := plugin.StartCommitAnalyzerPlugin(opts)
+	ca, err := plugin.StartPlugin(opts)
 	if err != nil {
 		return nil, err
 	}
-	return ca, nil
+	return ca.(analyzer.CommitAnalyzer), nil
 }
 
 func (m *PluginManager) GetChangelogGenerator() (generator.ChangelogGenerator, error) {
@@ -73,11 +73,11 @@ func (m *PluginManager) GetChangelogGenerator() (generator.ChangelogGenerator, e
 		return nil, err
 	}
 
-	cg, err := plugin.StartChangelogGeneratorPlugin(opts)
+	cg, err := plugin.StartPlugin(opts)
 	if err != nil {
 		return nil, err
 	}
-	return cg, nil
+	return cg.(generator.ChangelogGenerator), nil
 }
 
 func (m *PluginManager) GetChainedUpdater() (*updater.ChainedUpdater, error) {
@@ -88,11 +88,11 @@ func (m *PluginManager) GetChainedUpdater() (*updater.ChainedUpdater, error) {
 			return nil, err
 		}
 
-		upd, err := plugin.StartFilesUpdaterPlugin(opts)
+		upd, err := plugin.StartPlugin(opts)
 		if err != nil {
 			return nil, err
 		}
-		updaters = append(updaters, upd)
+		updaters = append(updaters, upd.(updater.FilesUpdater))
 	}
 
 	updater := &updater.ChainedUpdater{
@@ -109,11 +109,11 @@ func (m *PluginManager) GetChainedHooksExecutor() (*hooks.ChainedHooksExecutor,
 			return nil, err
 		}
 
-		hp, err := plugin.StartHooksPlugin(opts)
+		hp, err := plugin.StartPlugin(opts)
 		if err != nil {
 			return nil, err
 		}
-		hooksChain = append(hooksChain, hp)
+		hooksChain = append(hooksChain, hp.(hooks.Hooks))
 	}
 
 	return &hooks.ChainedHooksExecutor{