Skip to content
Merged
Show file tree
Hide file tree
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
9 changes: 4 additions & 5 deletions cli/azd/cmd/extensions.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,10 @@ func (a *extensionAction) Run(ctx context.Context) (*actions.ActionResult, error
}

options := &extensions.InvokeOptions{
Args: a.args,
Env: allEnv,
StdIn: a.console.Handles().Stdin,
StdOut: a.console.Handles().Stdout,
StdErr: a.console.Handles().Stderr,
Args: a.args,
Env: allEnv,
// cmd extensions are always interactive (connected to terminal)
Interactive: true,
}

_, err = a.extensionRunner.Invoke(ctx, extension, options)
Expand Down
31 changes: 18 additions & 13 deletions cli/azd/pkg/extensions/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ import (
)

type InvokeOptions struct {
Args []string
Env []string
StdIn io.Reader
StdOut io.Writer
StdErr io.Writer
Args []string
Env []string
StdIn io.Reader
StdOut io.Writer
StdErr io.Writer
Interactive bool
}

type Runner struct {
Expand Down Expand Up @@ -51,16 +52,20 @@ func (r *Runner) Invoke(ctx context.Context, extension *Extension, options *Invo
runArgs = runArgs.WithEnv(options.Env)
}

if options.StdIn != nil {
runArgs = runArgs.WithStdIn(options.StdIn)
}
if options.Interactive {
runArgs = runArgs.WithInteractive(true)
} else {
if options.StdIn != nil {
runArgs = runArgs.WithStdIn(options.StdIn)
}

if options.StdOut != nil {
runArgs = runArgs.WithStdOut(options.StdOut)
}
if options.StdOut != nil {
runArgs = runArgs.WithStdOut(options.StdOut)
}

if options.StdErr != nil {
runArgs = runArgs.WithStdErr(options.StdErr)
if options.StdErr != nil {
runArgs = runArgs.WithStdErr(options.StdErr)
}
}

Comment thread
vhvb1989 marked this conversation as resolved.
runResult, err := r.commandRunner.Run(ctx, runArgs)
Expand Down
Loading