feat: set module plugin working dir (#1247)

KusionStack · Aug 1, 2024 · a687f8f · a687f8f
1 parent 881d542
commit a687f8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -228,7 +228,7 @@ require (
 	github.com/hashicorp/hc-install v0.6.2
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
-	github.com/imdario/mergo v0.3.16
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect

diff --git a/pkg/modules/generators/app_configurations_generator.go b/pkg/modules/generators/app_configurations_generator.go
@@ -474,7 +474,7 @@ func (g *appConfigurationGenerator) invokeModule(
 ) (*proto.GeneratorResponse, error) {
 	// init the plugin
 	if pluginMap[key] == nil {
-		plugin, err := modules.NewPlugin(key)
+		plugin, err := modules.NewPlugin(key, g.stack.Path)
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/modules/plugin.go b/pkg/modules/plugin.go
@@ -42,13 +42,15 @@ type Plugin struct {
 	client *plugin.Client
 	// Module represents the real module impl
 	Module Module
+	// dir represents the working directory of the plugin binary, which will be typically set as the stack path.
+	dir string
 }
 
-func NewPlugin(key string) (*Plugin, error) {
+func NewPlugin(key, dir string) (*Plugin, error) {
 	if key == "" {
 		return nil, fmt.Errorf("module key can not be empty")
 	}
-	p := &Plugin{key: key}
+	p := &Plugin{key: key, dir: dir}
 	err := p.initModule()
 	if err != nil {
 		return nil, err
@@ -75,7 +77,7 @@ func (p *Plugin) initModule() error {
 		return err
 	}
 	pluginName := prefix[0] + "-" + prefix[1]
-	client, err := NewPluginClient(pluginPath, pluginName)
+	client, err := NewPluginClient(pluginPath, pluginName, p.dir)
 	if err != nil {
 		return err
 	}
@@ -122,7 +124,7 @@ func buildPluginPath(namespace, resourceType, version string) (string, error) {
 	return p, nil
 }
 
-func NewPluginClient(modulePluginPath, moduleName string) (*plugin.Client, error) {
+func NewPluginClient(modulePluginPath, moduleName, workingDir string) (*plugin.Client, error) {
 	// create the plugin log file
 	var logFilePath string
 	dir, err := kfile.KusionDataFolder()
@@ -148,11 +150,14 @@ func NewPluginClient(modulePluginPath, moduleName string) (*plugin.Client, error
 		Level:  hclog.Debug,
 	})
 
+	cmd := exec.Command(modulePluginPath)
+	cmd.Dir = workingDir
+
 	// We're a host! Start by launching the plugin process.Need to defer kill
 	client := plugin.NewClient(&plugin.ClientConfig{
 		HandshakeConfig: HandshakeConfig,
 		Plugins:         PluginMap,
-		Cmd:             exec.Command(modulePluginPath),
+		Cmd:             cmd,
 		AllowedProtocols: []plugin.Protocol{
 			plugin.ProtocolGRPC,
 		},