Build with custom logger

Author: stephanos

sdkbuild/dotnet.go

@@ -9,6 +9,8 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"io"
 )
 
 // BuildDotNetProgramOptions are options for BuildDotNetProgram.
@@ -27,6 +29,9 @@ type BuildDotNetProgramOptions struct {
 	// Required csproj content. This should not contain a dependency on Temporalio
 	// because this adds a package/project reference near the end.
 	CsprojContents string
+	// If present, custom writers that will capture stdout/stderr.
+	Stdout io.Writer
+	Stderr io.Writer
 }
 
 // DotNetProgram is a .NET-specific implementation of Program.
@@ -77,7 +82,7 @@ func BuildDotNetProgram(ctx context.Context, options BuildDotNetProgramOptions)
 		// Need to build this csproj first
 		cmd := exec.CommandContext(ctx, "dotnet", "build", absCsproj)
 		cmd.Dir = dir
-		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+		setupCommandIO(cmd, options.Stdout, options.Stderr)
 		if err := cmd.Run(); err != nil {
 			return nil, fmt.Errorf("failed dotnet build of csproj in version: %w", err)
 		}
@@ -103,7 +108,7 @@ func BuildDotNetProgram(ctx context.Context, options BuildDotNetProgramOptions)
 	}
 	cmd := exec.CommandContext(ctx, "dotnet", cmdArgs...)
 	cmd.Dir = dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, options.Stdout, options.Stderr)
 	if err := cmd.Run(); err != nil {
 		return nil, fmt.Errorf("failed dotnet build: %w", err)
 	}
@@ -134,6 +139,6 @@ func (d *DotNetProgram) NewCommand(ctx context.Context, args ...string) (*exec.C
 	}
 	cmd := exec.CommandContext(ctx, exe, args...)
 	cmd.Dir = d.dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, nil, nil)
 	return cmd, nil
 }

sdkbuild/go.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -37,6 +38,9 @@ type BuildGoProgramOptions struct {
 	// If present, applied to build commands before run. May be called multiple
 	// times for a single build.
 	ApplyToCommand func(context.Context, *exec.Cmd) error
+	// If present, custom writers that will capture stdout/stderr.
+	Stdout io.Writer
+	Stderr io.Writer
 }
 
 // GoProgram is a Go-specific implementation of Program.
@@ -112,7 +116,7 @@ func BuildGoProgram(ctx context.Context, options BuildGoProgramOptions) (*GoProg
 	// Tidy it
 	cmd := exec.CommandContext(ctx, "go", "mod", "tidy")
 	cmd.Dir = dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, options.Stdout, options.Stderr)
 	if options.ApplyToCommand != nil {
 		if err := options.ApplyToCommand(ctx, cmd); err != nil {
 			return nil, err
@@ -133,7 +137,7 @@ func BuildGoProgram(ctx context.Context, options BuildGoProgramOptions) (*GoProg
 	}
 	cmd = exec.CommandContext(ctx, "go", cmdArgs...)
 	cmd.Dir = dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, options.Stdout, options.Stderr)
 	if options.ApplyToCommand != nil {
 		if err := options.ApplyToCommand(ctx, cmd); err != nil {
 			return nil, err
@@ -169,6 +173,6 @@ func (g *GoProgram) NewCommand(ctx context.Context, args ...string) (*exec.Cmd,
 	}
 	cmd := exec.CommandContext(ctx, exe, args...)
 	cmd.Dir = g.dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, nil, nil)
 	return cmd, nil
 }

sdkbuild/java.go

@@ -3,6 +3,7 @@ package sdkbuild
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -35,6 +36,9 @@ type BuildJavaProgramOptions struct {
 	// If present, applied to build commands before run. May be called multiple
 	// times for a single build.
 	ApplyToCommand func(context.Context, *exec.Cmd) error
+	// If present, custom writers that will capture stdout/stderr.
+	Stdout io.Writer
+	Stderr io.Writer
 }
 
 // JavaProgram is a Java-specific implementation of Program.
@@ -139,6 +143,7 @@ includeBuild('` + asAbsPath + `') {
 		// used by run.
 		cmd := j.buildGradleCommand(ctx, dir, true,
 			options.ApplyToCommand, "--no-daemon", "--include-build", "../", "build")
+		setupCommandIO(cmd, options.Stdout, options.Stderr)
 		if err := cmd.Run(); err != nil {
 			return nil, err
 		}
@@ -177,7 +182,9 @@ func (j *JavaProgram) NewCommand(ctx context.Context, args ...string) (*exec.Cmd
 		}
 		argsStr += "'" + arg + "'"
 	}
-	return j.buildGradleCommand(ctx, j.dir, true, nil, "--include-build", "../", "run", "--args", argsStr), nil
+	cmd := j.buildGradleCommand(ctx, j.dir, true, nil, "--include-build", "../", "run", "--args", argsStr)
+	setupCommandIO(cmd, nil, nil)
+	return cmd, nil
 }
 
 func (j *JavaProgram) buildGradleCommand(
@@ -207,6 +214,5 @@ func (j *JavaProgram) buildGradleCommand(
 
 	cmd := exec.CommandContext(ctx, exe, args...)
 	cmd.Dir = dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	return cmd
 }

sdkbuild/php.go

@@ -7,6 +7,8 @@ import (
 	"os/exec"
 	"path/filepath"
 	"runtime"
+
+	"io"
 )
 
 // BuildPhpProgramOptions are options for BuildPhpProgram.
@@ -17,6 +19,9 @@ type BuildPhpProgramOptions struct {
 	// a temporary dir is created.
 	DirName string
 	RootDir string
+	// If present, custom writers that will capture stdout/stderr.
+	Stdout io.Writer
+	Stderr io.Writer
 }
 
 // PhpProgram is a PHP-specific implementation of Program.
@@ -47,7 +52,7 @@ func BuildPhpProgram(ctx context.Context, options BuildPhpProgramOptions) (*PhpP
 
 	// Skip if installed
 	if st, err := os.Stat(filepath.Join(dir, "vendor")); err == nil && st.IsDir() {
-		return &PhpProgram{dir, sourceDir}, nil
+		return &PhpProgram{dir: dir, source: sourceDir}, nil
 	}
 
 	// Copy composer.json from sourceDir into dir
@@ -75,7 +80,7 @@ func BuildPhpProgram(ctx context.Context, options BuildPhpProgramOptions) (*PhpP
 	if options.Version != "" {
 		cmd = exec.CommandContext(ctx, "composer", "req", "temporal/sdk", options.Version, "-W", "--no-install", "--ignore-platform-reqs")
 		cmd.Dir = dir
-		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+		setupCommandIO(cmd, options.Stdout, options.Stderr)
 		if err := cmd.Run(); err != nil {
 			return nil, fmt.Errorf("failed installing SDK deps: %w", err)
 		}
@@ -84,7 +89,7 @@ func BuildPhpProgram(ctx context.Context, options BuildPhpProgramOptions) (*PhpP
 	// Install dependencies via composer
 	cmd = exec.CommandContext(ctx, "composer", "i", "-n", "-o", "-q", "--no-scripts", "--ignore-platform-reqs")
 	cmd.Dir = dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, options.Stdout, options.Stderr)
 	if err := cmd.Run(); err != nil {
 		return nil, fmt.Errorf("failed installing SDK deps: %w", err)
 	}
@@ -98,7 +103,7 @@ func BuildPhpProgram(ctx context.Context, options BuildPhpProgramOptions) (*PhpP
 	if os.IsNotExist(err) {
 		cmd = exec.CommandContext(ctx, "composer", "run", "rr-get")
 		cmd.Dir = dir
-		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+		setupCommandIO(cmd, options.Stdout, options.Stderr)
 		if err := cmd.Run(); err != nil {
 			return nil, fmt.Errorf("failed downloading RoadRunner: %w", err)
 		}
@@ -130,6 +135,6 @@ func (p *PhpProgram) NewCommand(ctx context.Context, args ...string) (*exec.Cmd,
 	args = append([]string{filepath.Join(p.source, "runner.php")}, args...)
 	cmd := exec.CommandContext(ctx, "php", args...)
 	cmd.Dir = p.dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, nil, nil)
 	return cmd, nil
 }

sdkbuild/python.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"io"
 )
 
 // BuildPythonProgramOptions are options for BuildPythonProgram.
@@ -28,6 +30,9 @@ type BuildPythonProgramOptions struct {
 	// If present, applied to build commands before run. May be called multiple
 	// times for a single build.
 	ApplyToCommand func(context.Context, *exec.Cmd) error
+	// If present, custom writers that will capture stdout/stderr.
+	Stdout io.Writer
+	Stderr io.Writer
 }
 
 // PythonProgram is a Python-specific implementation of Program.
@@ -71,7 +76,7 @@ func BuildPythonProgram(ctx context.Context, options BuildPythonProgramOptions)
 	executeCommand := func(name string, args ...string) error {
 		cmd := exec.CommandContext(ctx, name, args...)
 		cmd.Dir = dir
-		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+		setupCommandIO(cmd, options.Stdout, options.Stderr)
 		if options.ApplyToCommand != nil {
 			if err := options.ApplyToCommand(ctx, cmd); err != nil {
 				return err
@@ -96,7 +101,7 @@ requires-python = "~=3.9"
 		executeCommand("uv", "add", options.VersionFromPyProj)
 	} else if strings.ContainsAny(options.Version, `/\`) {
 		// It's a path; install from wheel
-		wheel, err := getWheel(ctx, options.Version)
+		wheel, err := getWheel(ctx, options.Version, options.Stdout, options.Stderr)
 		if err != nil {
 			return nil, err
 		}
@@ -115,7 +120,7 @@ requires-python = "~=3.9"
 	return &PythonProgram{dir}, nil
 }
 
-func getWheel(ctx context.Context, version string) (string, error) {
+func getWheel(ctx context.Context, version string, stdout, stderr io.Writer) (string, error) {
 	// We expect a dist/ directory with a single whl file present
 	sdkPath, err := filepath.Abs(version)
 	if err != nil {
@@ -132,13 +137,13 @@ getWheels:
 		// Try to build the project
 		cmd := exec.CommandContext(ctx, "uv", "sync")
 		cmd.Dir = sdkPath
-		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+		setupCommandIO(cmd, stdout, stderr)
 		if err := cmd.Run(); err != nil {
 			return "", fmt.Errorf("problem installing deps when building sdk by path: %w", err)
 		}
 		cmd = exec.CommandContext(ctx, "uv", "build")
 		cmd.Dir = sdkPath
-		cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+		setupCommandIO(cmd, stdout, stderr)
 		if err := cmd.Run(); err != nil {
 			return "", fmt.Errorf("problem building sdk by path: %w", err)
 		}
@@ -181,6 +186,6 @@ func (p *PythonProgram) NewCommand(ctx context.Context, args ...string) (*exec.C
 	args = append([]string{"run", "python", "-m"}, args...)
 	cmd := exec.CommandContext(ctx, "uv", args...)
 	cmd.Dir = p.dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, nil, nil)
 	return cmd, nil
 }

sdkbuild/sdkbuild.go

@@ -3,7 +3,10 @@
 package sdkbuild
 
 import (
+	"cmp"
 	"context"
+	"io"
+	"os"
 	"os/exec"
 )
 
@@ -17,3 +20,11 @@ type Program interface {
 	// stdio set as the current stdio.
 	NewCommand(ctx context.Context, args ...string) (*exec.Cmd, error)
 }
+
+// setupCommandIO sets up the command's I/O. If stdout or stderr are nil,
+// defaults to os.Stdout and os.Stderr respectively. os.Stdin is always set to os.Stdin.
+func setupCommandIO(cmd *exec.Cmd, stdout, stderr io.Writer) {
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = cmp.Or(stdout, os.Stdout)
+	cmd.Stderr = cmp.Or(stderr, os.Stderr)
+}

sdkbuild/typescript.go

@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+
+	"io"
 )
 
 // BuildTypeScriptProgramOptions are options for BuildTypeScriptProgram.
@@ -33,6 +35,9 @@ type BuildTypeScriptProgramOptions struct {
 	Excludes []string
 	// If present, add additional dependencies -> version string to package.json.
 	MoreDependencies map[string]string
+	// If present, custom writers that will capture stdout/stderr.
+	Stdout io.Writer
+	Stderr io.Writer
 }
 
 // TypeScriptProgram is a TypeScript-specific implementation of Program.
@@ -255,12 +260,12 @@ func TypeScriptProgramFromDir(dir string) (*TypeScriptProgram, error) {
 // Dir is the directory to run in.
 func (t *TypeScriptProgram) Dir() string { return t.dir }
 
-// NewCommand makes a new Node command. The first argument needs to be the name
-// of the script.
+// NewCommand makes a new Node command.
+// The first argument needs to be the name of the script.
 func (t *TypeScriptProgram) NewCommand(ctx context.Context, args ...string) (*exec.Cmd, error) {
 	args = append([]string{"-r", "tsconfig-paths/register"}, args...)
 	cmd := exec.CommandContext(ctx, "node", args...)
 	cmd.Dir = t.dir
-	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
+	setupCommandIO(cmd, nil, nil)
 	return cmd, nil
 }