remove wrapped streams and readline

This commit is contained in:
James Bardin
2021-10-27 10:28:19 -04:00
parent 622c4df14c
commit 42742c173d
8 changed files with 8 additions and 256 deletions

View File

@@ -3,11 +3,11 @@ package command
import (
"bufio"
"fmt"
"os"
"strings"
"github.com/hashicorp/terraform/internal/addrs"
"github.com/hashicorp/terraform/internal/backend"
"github.com/hashicorp/terraform/internal/helper/wrappedstreams"
"github.com/hashicorp/terraform/internal/repl"
"github.com/hashicorp/terraform/internal/terraform"
"github.com/hashicorp/terraform/internal/tfdiags"
@@ -113,8 +113,8 @@ func (c *ConsoleCommand) Run(args []string) int {
// Set up the UI so we can output directly to stdout
ui := &cli.BasicUi{
Writer: wrappedstreams.Stdout(),
ErrorWriter: wrappedstreams.Stderr(),
Writer: os.Stdout,
ErrorWriter: os.Stderr,
}
evalOpts := &terraform.EvalOpts{}
@@ -164,7 +164,7 @@ func (c *ConsoleCommand) Run(args []string) int {
func (c *ConsoleCommand) modePiped(session *repl.Session, ui cli.Ui) int {
var lastResult string
scanner := bufio.NewScanner(wrappedstreams.Stdin())
scanner := bufio.NewScanner(os.Stdin)
for scanner.Scan() {
result, exit, diags := session.Handle(strings.TrimSpace(scanner.Text()))
if diags.HasErrors() {

View File

@@ -9,6 +9,7 @@ package command
import (
"fmt"
"io"
"os"
"github.com/hashicorp/terraform/internal/repl"
@@ -23,6 +24,9 @@ func (c *ConsoleCommand) modeInteractive(session *repl.Session, ui cli.Ui) int {
InterruptPrompt: "^C",
EOFPrompt: "exit",
HistorySearchFold: true,
Stdin: os.Stdin,
Stdout: os.Stdout,
Stderr: os.Stderr,
})
if err != nil {
c.Ui.Error(fmt.Sprintf(