fix: unquote environment variable passed to hook commands (#410)

Co-authored-by: Michael Brooks <michael@michaelbrooks.ca>

Author: zimeg

internal/hooks/hook_executor_default_test.go

@@ -60,8 +60,9 @@ func Test_Hook_Execute_Default_Protocol(t *testing.T) {
 			opts: HookExecOpts{
 				Hook: HookScript{Name: "happypath", Command: "echo {}"},
 				Env: map[string]string{
-					"batman": "robin",
-					"yin":    "yang",
+					"BATMAN": "robin",
+					"WHOAMI": "lumpy space princess",
+					"YIN":    "yang",
 				},
 				Exec: &MockExec{
 					mockCommand: &MockCommand{
@@ -74,8 +75,9 @@ func Test_Hook_Execute_Default_Protocol(t *testing.T) {
 				response, err := executor.Execute(ctx, opts)
 				require.Equal(t, "test output", response)
 				require.Equal(t, nil, err)
-				require.Contains(t, opts.Exec.(*MockExec).mockCommand.Env, `batman="robin"`)
-				require.Contains(t, opts.Exec.(*MockExec).mockCommand.Env, `yin="yang"`)
+				require.Contains(t, opts.Exec.(*MockExec).mockCommand.Env, `BATMAN=robin`)
+				require.Contains(t, opts.Exec.(*MockExec).mockCommand.Env, `WHOAMI=lumpy space princess`)
+				require.Contains(t, opts.Exec.(*MockExec).mockCommand.Env, `YIN=yang`)
 			},
 		},
 		"failed execution": {

internal/hooks/hook_executor_v2_test.go

@@ -55,8 +55,9 @@ func Test_Hook_Execute_V2_Protocol(t *testing.T) {
 			opts: HookExecOpts{
 				Hook: HookScript{Name: "happypath", Command: "echo {}"},
 				Env: map[string]string{
-					"batman": "robin",
-					"yin":    "yang",
+					"BATMAN": "robin",
+					"WHOAMI": "lumpy space princess",
+					"YIN":    "yang",
 				},
 				Exec: &MockExec{
 					mockCommand: &MockCommand{
@@ -68,16 +69,17 @@ func Test_Hook_Execute_V2_Protocol(t *testing.T) {
 			check: func(t *testing.T, response string, err error, mockExec ExecInterface) {
 				require.Equal(t, `{"message": "hello world"}`, response)
 				require.Equal(t, nil, err)
-				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `batman="robin"`)
-				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `yin="yang"`)
+				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `BATMAN=robin`)
+				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `WHOAMI=lumpy space princess`)
+				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `YIN=yang`)
 			},
 		},
 		"successful execution with payload > 64kb": {
 			opts: HookExecOpts{
 				Hook: HookScript{Name: "happypath", Command: "echo {}"},
 				Env: map[string]string{
-					"batman": "robin",
-					"yin":    "yang",
+					"BATMAN": "robin",
+					"YIN":    "yang",
 				},
 				Exec: &MockExec{
 					mockCommand: &MockCommand{
@@ -89,8 +91,8 @@ func Test_Hook_Execute_V2_Protocol(t *testing.T) {
 			check: func(t *testing.T, response string, err error, mockExec ExecInterface) {
 				require.Equal(t, sixtyFourKBString, response)
 				require.Equal(t, nil, err)
-				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `batman="robin"`)
-				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `yin="yang"`)
+				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `BATMAN=robin`)
+				require.Contains(t, mockExec.(*MockExec).mockCommand.Env, `YIN=yang`)
 			},
 		},
 		"successful execution with payload > 512kb": {

internal/hooks/hooks.go

@@ -57,7 +57,9 @@ func processExecOpts(opts HookExecOpts) ([]string, []string, []string, error) {
 	// To avoid removing any environment variables that are set in the current environment, we first set the cmd.Env to the current environment.
 	// before adding any new environment variables.
 	var cmdEnvVars = os.Environ()
-	cmdEnvVars = append(cmdEnvVars, goutils.MapToStringSlice(opts.Env, "")...)
+	for name, value := range opts.Env {
+		cmdEnvVars = append(cmdEnvVars, name+"="+value)
+	}
 
 	return cmdArgs, cmdArgVars, cmdEnvVars, nil
 }

internal/pkg/platform/localserver.go

@@ -30,7 +30,6 @@ import (
 	"github.com/gorilla/websocket"
 	"github.com/radovskyb/watcher"
 	"github.com/slackapi/slack-cli/internal/config"
-	"github.com/slackapi/slack-cli/internal/goutils"
 	"github.com/slackapi/slack-cli/internal/hooks"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/pkg/apps"
@@ -307,7 +306,9 @@ func (r *LocalServer) StartDelegate(ctx context.Context) error {
 	// To avoid removing any environment variables that are set in the current environment, we first set the cmd.Env to the current environment.
 	// before adding any new environment variables.
 	var cmdEnvVars = os.Environ()
-	cmdEnvVars = append(cmdEnvVars, goutils.MapToStringSlice(sdkManagedConnectionStartHookOpts.Env, "")...)
+	for name, value := range sdkManagedConnectionStartHookOpts.Env {
+		cmdEnvVars = append(cmdEnvVars, name+"="+value)
+	}
 	cmd := sdkManagedConnectionStartHookOpts.Exec.Command(cmdEnvVars, os.Stdout, os.Stderr, nil, cmdArgs[0], cmdArgVars...)
 
 	// Store command reference for lifecycle management