prevent plugins in Windows from creating terminals (vmware-archive#2701)

Signed-off-by: Wayne Witzel III <wayne@riotousliving.com>
kubefun · Aug 30, 2021 · ff7d861 · ff7d861
1 parent 79ef374
commit ff7d861
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/changelogs/unreleased/2143-wwitzel3 b/changelogs/unreleased/2143-wwitzel3
@@ -0,0 +1 @@
+fixed Go plugins spawning terminals under Windows
diff --git a/pkg/plugin/manager.go b/pkg/plugin/manager.go
@@ -12,7 +12,6 @@ package plugin
 import (
 	"context"
 	"fmt"
-	"os/exec"
 	"path/filepath"
 	"sort"
 	"sync"
@@ -60,10 +59,12 @@ func (f *DefaultClientFactory) Init(ctx context.Context, cmd string) Client {
 		dashLogger: log.From(ctx),
 	}
 
+	c := pluginCmd(cmd)
+
 	return plugin.NewClient(&plugin.ClientConfig{
 		HandshakeConfig: Handshake,
 		Plugins:         pluginMap,
-		Cmd:             exec.Command(cmd),
+		Cmd:             c,
 		AllowedProtocols: []plugin.Protocol{
 			plugin.ProtocolGRPC,
 		},

diff --git a/pkg/plugin/plugincmd_unix.go b/pkg/plugin/plugincmd_unix.go
@@ -0,0 +1,17 @@
+// +build !windows
+
+/*
+Copyright (c) 2019 the Octant contributors. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package plugin
+
+import (
+	"os/exec"
+)
+
+func pluginCmd(cmd string) *exec.Cmd {
+	pluginCmd := exec.Command(cmd)
+	return pluginCmd
+}
diff --git a/pkg/plugin/plugincmd_windows.go b/pkg/plugin/plugincmd_windows.go
@@ -0,0 +1,19 @@
+// +build windows
+
+/*
+Copyright (c) 2019 the Octant contributors. All Rights Reserved.
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package plugin
+
+import (
+	"os/exec"
+	"syscall"
+)
+
+func pluginCmd(cmd string) *exec.Cmd {
+	pluginCmd := exec.Command(cmd)
+	pluginCmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
+	return pluginCmd
+}