Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions pkg/module_manager/models/hooks/kind/batch_hook.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"log/slog"
"os"
Expand Down Expand Up @@ -187,22 +186,6 @@ func (h *BatchHook) Execute(ctx context.Context, configVersion string, bContext
usage, err := cmd.RunAndLogLines(ctx, logLabels)
result.Usage = usage
if err != nil {
outputError := &sdkhook.Error{}
trimmed := strings.TrimPrefix(err.Error(), "stderr:")

// Try to parse stderr as a JSON error from the SDK.
// If stderr contains non-JSON content (e.g. log lines before the JSON error),
// fall back to returning the raw stderr content as the error message.
jsonErr := json.NewDecoder(bytes.NewBufferString(trimmed)).Decode(outputError)
if jsonErr != nil {
h.Logger.Warn("json decode", slog.String("original", trimmed), log.Err(err))
return result, fmt.Errorf("json decode: %w", jsonErr)
}

if outputError.Message != "" {
return result, errors.New(outputError.Message)
}

return result, fmt.Errorf("run and log lines: %w", err)
}

Expand Down
Loading