- Define Logger interface with Debug and Error methods - Add NopLogger as default (no-op implementation) - Add SetDefaultLogger/DefaultLogger for package-level config - Add WithLogger method for per-command logger injection - Log commands at DEBUG level before execution - Log failures at ERROR level with error details - Add comprehensive tests for logger functionality Compatible with pkg/log.Logger and other structured loggers. Closes #90 Co-authored-by: Claude <noreply@anthropic.com>
176 lines
4 KiB
Go
176 lines
4 KiB
Go
package exec
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
)
|
|
|
|
// Options configuration for command execution
|
|
type Options struct {
|
|
Dir string
|
|
Env []string
|
|
Stdin io.Reader
|
|
Stdout io.Writer
|
|
Stderr io.Writer
|
|
// If true, command will run in background (not implemented in this wrapper yet)
|
|
// Background bool
|
|
}
|
|
|
|
// Command wraps os/exec.Command with logging and context
|
|
func Command(ctx context.Context, name string, args ...string) *Cmd {
|
|
return &Cmd{
|
|
name: name,
|
|
args: args,
|
|
ctx: ctx,
|
|
}
|
|
}
|
|
|
|
// Cmd represents a wrapped command
|
|
type Cmd struct {
|
|
name string
|
|
args []string
|
|
ctx context.Context
|
|
opts Options
|
|
cmd *exec.Cmd
|
|
logger Logger
|
|
}
|
|
|
|
// WithDir sets the working directory
|
|
func (c *Cmd) WithDir(dir string) *Cmd {
|
|
c.opts.Dir = dir
|
|
return c
|
|
}
|
|
|
|
// WithEnv sets the environment variables
|
|
func (c *Cmd) WithEnv(env []string) *Cmd {
|
|
c.opts.Env = env
|
|
return c
|
|
}
|
|
|
|
// WithStdin sets stdin
|
|
func (c *Cmd) WithStdin(r io.Reader) *Cmd {
|
|
c.opts.Stdin = r
|
|
return c
|
|
}
|
|
|
|
// WithStdout sets stdout
|
|
func (c *Cmd) WithStdout(w io.Writer) *Cmd {
|
|
c.opts.Stdout = w
|
|
return c
|
|
}
|
|
|
|
// WithStderr sets stderr
|
|
func (c *Cmd) WithStderr(w io.Writer) *Cmd {
|
|
c.opts.Stderr = w
|
|
return c
|
|
}
|
|
|
|
// WithLogger sets a custom logger for this command.
|
|
// If not set, the package default logger is used.
|
|
func (c *Cmd) WithLogger(l Logger) *Cmd {
|
|
c.logger = l
|
|
return c
|
|
}
|
|
|
|
// Run executes the command and waits for it to finish.
|
|
// It automatically logs the command execution at debug level.
|
|
func (c *Cmd) Run() error {
|
|
c.prepare()
|
|
c.logDebug("executing command")
|
|
|
|
if err := c.cmd.Run(); err != nil {
|
|
wrapped := wrapError(err, c.name, c.args)
|
|
c.logError("command failed", wrapped)
|
|
return wrapped
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Output runs the command and returns its standard output.
|
|
func (c *Cmd) Output() ([]byte, error) {
|
|
c.prepare()
|
|
c.logDebug("executing command")
|
|
|
|
out, err := c.cmd.Output()
|
|
if err != nil {
|
|
wrapped := wrapError(err, c.name, c.args)
|
|
c.logError("command failed", wrapped)
|
|
return nil, wrapped
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// CombinedOutput runs the command and returns its combined standard output and standard error.
|
|
func (c *Cmd) CombinedOutput() ([]byte, error) {
|
|
c.prepare()
|
|
c.logDebug("executing command")
|
|
|
|
out, err := c.cmd.CombinedOutput()
|
|
if err != nil {
|
|
wrapped := wrapError(err, c.name, c.args)
|
|
c.logError("command failed", wrapped)
|
|
return out, wrapped
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
func (c *Cmd) prepare() {
|
|
if c.ctx != nil {
|
|
c.cmd = exec.CommandContext(c.ctx, c.name, c.args...)
|
|
} else {
|
|
// Should we enforce context? The issue says "Enforce context usage".
|
|
// For now, let's allow nil but log a warning if we had a logger?
|
|
// Or strictly panic/error?
|
|
// Let's fallback to Background for now but maybe strict later.
|
|
c.cmd = exec.Command(c.name, c.args...)
|
|
}
|
|
|
|
c.cmd.Dir = c.opts.Dir
|
|
if len(c.opts.Env) > 0 {
|
|
c.cmd.Env = append(os.Environ(), c.opts.Env...)
|
|
}
|
|
|
|
c.cmd.Stdin = c.opts.Stdin
|
|
c.cmd.Stdout = c.opts.Stdout
|
|
c.cmd.Stderr = c.opts.Stderr
|
|
}
|
|
|
|
// RunQuiet executes the command suppressing stdout unless there is an error.
|
|
// Useful for internal commands.
|
|
func RunQuiet(ctx context.Context, name string, args ...string) error {
|
|
var stderr bytes.Buffer
|
|
cmd := Command(ctx, name, args...).WithStderr(&stderr)
|
|
if err := cmd.Run(); err != nil {
|
|
// Include stderr in error message
|
|
return fmt.Errorf("%w: %s", err, strings.TrimSpace(stderr.String()))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func wrapError(err error, name string, args []string) error {
|
|
cmdStr := name + " " + strings.Join(args, " ")
|
|
if exitErr, ok := err.(*exec.ExitError); ok {
|
|
return fmt.Errorf("command %q failed with exit code %d: %w", cmdStr, exitErr.ExitCode(), err)
|
|
}
|
|
return fmt.Errorf("failed to execute %q: %w", cmdStr, err)
|
|
}
|
|
|
|
func (c *Cmd) getLogger() Logger {
|
|
if c.logger != nil {
|
|
return c.logger
|
|
}
|
|
return defaultLogger
|
|
}
|
|
|
|
func (c *Cmd) logDebug(msg string) {
|
|
c.getLogger().Debug(msg, "cmd", c.name, "args", strings.Join(c.args, " "))
|
|
}
|
|
|
|
func (c *Cmd) logError(msg string, err error) {
|
|
c.getLogger().Error(msg, "cmd", c.name, "args", strings.Join(c.args, " "), "err", err)
|
|
}
|