chore: merge w main

Author: zimeg

go.mod

@@ -59,7 +59,7 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fatih/color v1.15.0 // indirect
-	github.com/go-git/go-git/v5 v5.16.0
+	github.com/go-git/go-git/v5 v5.16.1
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kubescape/go-git-url v0.0.30

go.sum

@@ -53,8 +53,8 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN
 github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
-github.com/go-git/go-git/v5 v5.16.0 h1:k3kuOEpkc0DeY7xlL6NaaNg39xdgQbtH5mwCafHO9AQ=
-github.com/go-git/go-git/v5 v5.16.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
+github.com/go-git/go-git/v5 v5.16.1 h1:TuxMBWNL7R05tXsUGi0kh1vi4tq0WfXNLlIrAkXG1k8=
+github.com/go-git/go-git/v5 v5.16.1/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=

internal/hooks/hook_executor_default.go

@@ -72,8 +72,14 @@ func (e *HookExecutorDefaultProtocol) Execute(ctx context.Context, opts HookExec
 
 	response := strings.TrimSpace(buffout.String())
 	if err != nil {
+		// Include stderr outputs in error details if these aren't streamed
+		details := slackerror.ErrorDetails{}
+		if opts.Stderr == nil {
+			details = append(details, slackerror.ErrorDetail{Message: strings.TrimSpace(bufferr.String())})
+		}
 		return "", slackerror.New(slackerror.ErrSDKHookInvocationFailed).
-			WithMessage("Command for '%s' returned an error: %s\n%s", opts.Hook.Name, err, strings.TrimSpace(bufferr.String()))
+			WithMessage("Error running '%s' command: %s", opts.Hook.Name, err).
+			WithDetails(details)
 	}
 
 	// Special handling for the baseline protocol for the `start` hook

internal/hooks/hook_executor_default_test.go

@@ -90,7 +90,12 @@ func Test_Hook_Execute_Default_Protocol(t *testing.T) {
 				},
 			},
 			expectedError: slackerror.New(slackerror.ErrSDKHookInvocationFailed).
-				WithMessage("Command for 'sadpath' returned an error: explosion\nthere was a problem compiling your app"),
+				WithMessage("Error running 'sadpath' command: explosion").
+				WithDetails(slackerror.ErrorDetails{
+					slackerror.ErrorDetail{
+						Message: "there was a problem compiling your app",
+					},
+				}),
 			expectedResponse: "",
 		},
 		"successful deploy command": {

internal/hooks/hook_executor_v2.go

@@ -86,8 +86,14 @@ func (e *HookExecutorMessageBoundaryProtocol) Execute(ctx context.Context, opts
 
 	cmd := opts.Exec.Command(cmdEnvVars, &stdout, stderr, opts.Stdin, cmdArgs[0], cmdArgVars...)
 	if err = cmd.Run(); err != nil {
+		// Include stderr outputs in error details if these aren't streamed
+		details := slackerror.ErrorDetails{}
+		if opts.Stderr == nil {
+			details = append(details, slackerror.ErrorDetail{Message: strings.TrimSpace(bufferr.String())})
+		}
 		return "", slackerror.New(slackerror.ErrSDKHookInvocationFailed).
-			WithMessage("Error running '%s' command: %s", opts.Hook.Name, err)
+			WithMessage("Error running '%s' command: %s", opts.Hook.Name, err).
+			WithDetails(details)
 	}
 	return buffout.String(), nil
 }

internal/hooks/hook_executor_v2_test.go

@@ -113,13 +113,21 @@ func Test_Hook_Execute_V2_Protocol(t *testing.T) {
 				Hook: HookScript{Command: "boom", Name: "sadpath"},
 				Exec: &MockExec{
 					mockCommand: &MockCommand{
-						Err: errors.New("explosion"),
+						Err:        errors.New("explosion"),
+						MockStderr: []byte("fireworks for the skies above"),
 					},
 				},
 			},
 			check: func(t *testing.T, response string, err error, mockExec ExecInterface) {
 				require.Equal(t, slackerror.New(slackerror.ErrSDKHookInvocationFailed).
-					WithMessage("Error running 'sadpath' command: explosion"), err)
+					WithMessage("Error running 'sadpath' command: explosion").
+					WithDetails(slackerror.ErrorDetails{
+						slackerror.ErrorDetail{
+							Message: "fireworks for the skies above",
+						},
+					}),
+					err,
+				)
 			},
 		},
 		"fail to parse payload due to improper boundary strings": {

internal/shared/clients_test.go

@@ -234,7 +234,7 @@ func Test_ClientFactory_InitSDKConfigFromJSON_brokenGetHooks(t *testing.T) {
 	err := clients.InitSDKConfigFromJSON(ctx, []byte(getHooksJSON))
 	require.Error(t, err)
 	assert.Equal(t, slackerror.New(slackerror.ErrSDKHookInvocationFailed).Code, slackerror.ToSlackError(err).Code)
-	assert.Contains(t, slackerror.ToSlackError(err).Message, "Command for 'GetHooks' returned an error")
+	assert.Contains(t, slackerror.ToSlackError(err).Message, "Error running 'GetHooks' command")
 }
 
 func Test_ClientFactory_InitSDKConfigFromJSON_brokenJSONFile(t *testing.T) {