fix: plugin npe

KusionStack · Mar 19, 2024 · 90c4da5 · 90c4da5
1 parent 1726f10
commit 90c4da5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/modules/generators/app_configurations_generator_test.go b/pkg/modules/generators/app_configurations_generator_test.go
@@ -66,7 +66,7 @@ func mockPlugin() {
 	mockey.Mock(modules.NewPlugin).To(func(key string) (*modules.Plugin, error) {
 		return &modules.Plugin{Module: &fakeModule{}}, nil
 	}).Build()
-	mockey.Mock((*modules.Plugin).KillPluginClient).Return().Build()
+	mockey.Mock((*modules.Plugin).KillPluginClient).Return(nil).Build()
 }
 
 func TestAppConfigurationGenerator_Generate_CustomNamespace(t *testing.T) {

diff --git a/pkg/modules/plugin.go b/pkg/modules/plugin.go
@@ -35,7 +35,7 @@ var PluginMap = map[string]plugin.Plugin{
 }
 
 type Plugin struct {
-	// key represents the module key, it consists of two parts: moduleName@version. e.g. "kusionstack/mysql@v0.1"
+	// key represents the module key, it consists of two parts: moduleName@version. e.g. "kusionstack/mysql@v0.1.0"
 	key    string
 	client *plugin.Client
 	// Module represents the real module impl
@@ -126,9 +126,12 @@ func newPluginClient(path string) *plugin.Client {
 	return client
 }
 
-func (p *Plugin) KillPluginClient() {
-	// fixme: if p.client is nil, it will panic
+func (p *Plugin) KillPluginClient() error {
+	if p.client == nil {
+		return fmt.Errorf("plugin: %s client is nil", p.key)
+	}
 	p.client.Kill()
+	return nil
 }
 
 func PluginDir() (string, error) {