bt: add output buffer

DavidGamba · Sep 19, 2024 · f286948 · f286948
1 parent 74c7203
commit f286948
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/bt/stack/dag.go b/bt/stack/dag.go
@@ -15,6 +15,7 @@ import (
 func generateDAG(opt *getoptions.GetOpt, id string, cfg *sconfig.Config, normal bool) (*dag.Graph, error) {
 	tm := dag.NewTaskMap()
 	g := dag.NewGraph("stack " + id)
+	g.SetOutputBuffer(os.Stdout)
 
 	wd, err := os.Getwd()
 	if err != nil {

diff --git a/bt/terraform/apply.go b/bt/terraform/apply.go
@@ -11,6 +11,7 @@ import (
 	"github.com/DavidGamba/dgtools/fsmodtime"
 	"github.com/DavidGamba/dgtools/run"
 	"github.com/DavidGamba/go-getoptions"
+	"github.com/DavidGamba/go-getoptions/dag"
 	"github.com/mattn/go-isatty"
 )
 
@@ -31,6 +32,8 @@ func applyRun(ctx context.Context, opt *getoptions.GetOpt, args []string) error
 
 	cfg := config.ConfigFromContext(ctx)
 	dir := DirFromContext(ctx)
+	stdout := dag.Stdout(ctx)
+	stderr := dag.Stderr(ctx)
 	LogConfig(cfg, profile)
 
 	ws, err := updateWSIfSelected(cfg.Config.DefaultTerraformProfile, cfg.Profile(profile), ws)
@@ -80,7 +83,7 @@ func applyRun(ctx context.Context, opt *getoptions.GetOpt, args []string) error
 		Logger.Printf("export %s\n", wsEnv)
 		ri.Env(wsEnv)
 	}
-	err = ri.Run()
+	err = ri.Run(stdout, stderr)
 	if err != nil {
 		os.Remove(filepath.Join(dir, planFile))
 		return fmt.Errorf("failed to run: %w", err)

diff --git a/bt/terraform/init.go b/bt/terraform/init.go
@@ -11,6 +11,7 @@ import (
 	"github.com/DavidGamba/dgtools/fsmodtime"
 	"github.com/DavidGamba/dgtools/run"
 	"github.com/DavidGamba/go-getoptions"
+	"github.com/DavidGamba/go-getoptions/dag"
 	"github.com/mattn/go-isatty"
 )
 
@@ -28,6 +29,8 @@ func initRun(ctx context.Context, opt *getoptions.GetOpt, args []string) error {
 
 	cfg := config.ConfigFromContext(ctx)
 	dir := DirFromContext(ctx)
+	stdout := dag.Stdout(ctx)
+	stderr := dag.Stderr(ctx)
 	LogConfig(cfg, profile)
 	os.Setenv("CONFIG_ROOT", cfg.ConfigRoot)
 
@@ -50,7 +53,7 @@ func initRun(ctx context.Context, opt *getoptions.GetOpt, args []string) error {
 	cmd = append(cmd, args...)
 	dataDir := fmt.Sprintf("TF_DATA_DIR=%s", getDataDir(cfg.Config.DefaultTerraformProfile, cfg.Profile(profile)))
 	Logger.Printf("export %s\n", dataDir)
-	err := run.CMDCtx(ctx, cmd...).Stdin().Log().Env(dataDir).Dir(dir).DryRun(dryRun).Run()
+	err := run.CMDCtx(ctx, cmd...).Stdin().Log().Env(dataDir).Dir(dir).DryRun(dryRun).Run(stdout, stderr)
 	if err != nil {
 		os.Remove(filepath.Join(dir, ".tf.lock"))
 		return fmt.Errorf("failed to run: %w", err)

diff --git a/bt/terraform/plan.go b/bt/terraform/plan.go
@@ -14,6 +14,7 @@ import (
 	"github.com/DavidGamba/dgtools/fsmodtime"
 	"github.com/DavidGamba/dgtools/run"
 	"github.com/DavidGamba/go-getoptions"
+	"github.com/DavidGamba/go-getoptions/dag"
 	"github.com/hashicorp/terraform-config-inspect/tfconfig"
 	"github.com/mattn/go-isatty"
 )
@@ -50,6 +51,8 @@ func planRun(ctx context.Context, opt *getoptions.GetOpt, args []string) error {
 
 	cfg := config.ConfigFromContext(ctx)
 	dir := DirFromContext(ctx)
+	stdout := dag.Stdout(ctx)
+	stderr := dag.Stderr(ctx)
 	LogConfig(cfg, profile)
 	os.Setenv("CONFIG_ROOT", cfg.ConfigRoot)
 
@@ -195,7 +198,7 @@ func planRun(ctx context.Context, opt *getoptions.GetOpt, args []string) error {
 		Logger.Printf("export %s\n", wsEnv)
 		ri.Env(wsEnv)
 	}
-	err = ri.Run()
+	err = ri.Run(stdout, stderr)
 	if err != nil {
 		// exit code 2 with detailed-exitcode means changes found
 		var eerr *exec.ExitError

diff --git a/bt/terraform/show_plan.go b/bt/terraform/show_plan.go
@@ -8,6 +8,7 @@ import (
 	"github.com/DavidGamba/dgtools/bt/config"
 	"github.com/DavidGamba/dgtools/run"
 	"github.com/DavidGamba/go-getoptions"
+	"github.com/DavidGamba/go-getoptions/dag"
 	"github.com/mattn/go-isatty"
 )
 
@@ -26,6 +27,8 @@ func showPlanRun(ctx context.Context, opt *getoptions.GetOpt, args []string) err
 
 	cfg := config.ConfigFromContext(ctx)
 	dir := DirFromContext(ctx)
+	stdout := dag.Stdout(ctx)
+	stderr := dag.Stderr(ctx)
 	LogConfig(cfg, profile)
 
 	ws, err := updateWSIfSelected(cfg.Config.DefaultTerraformProfile, cfg.Profile(profile), ws)
@@ -60,7 +63,7 @@ func showPlanRun(ctx context.Context, opt *getoptions.GetOpt, args []string) err
 		Logger.Printf("export %s\n", wsEnv)
 		ri.Env(wsEnv)
 	}
-	err = ri.Run()
+	err = ri.Run(stdout, stderr)
 	if err != nil {
 		return fmt.Errorf("failed to run: %w", err)
 	}