diff --git a/internal/terraform/exec/exec.go b/internal/terraform/exec/exec.go index 0a33675b..30caaebf 100644 --- a/internal/terraform/exec/exec.go +++ b/internal/terraform/exec/exec.go @@ -98,7 +98,6 @@ func (e *Executor) cmd(ctx context.Context, args ...string) (*command, error) { var outBuf bytes.Buffer var errBuf bytes.Buffer - args = append(args[:1], append([]string{"-no-color"}, args[1:]...)...) cmd := e.cmdCtxFunc(ctx, e.execPath, args...) cmd.Args = append([]string{"terraform"}, args...) cmd.Dir = e.workDir diff --git a/internal/terraform/exec/exec_test.go b/internal/terraform/exec/exec_test.go index e73293ce..5d6a4a30 100644 --- a/internal/terraform/exec/exec_test.go +++ b/internal/terraform/exec/exec_test.go @@ -11,14 +11,14 @@ import ( func TestExec_timeout(t *testing.T) { e := MockExecutor(&MockCall{ - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, SleepDuration: 100 * time.Millisecond, Stdout: "Terraform v0.12.0\n", })("") e.SetWorkdir(os.TempDir()) e.timeout = 1 * time.Millisecond - expectedErr := ExecTimeoutError([]string{"terraform", "version", "-no-color"}, e.timeout) + expectedErr := ExecTimeoutError([]string{"terraform", "version"}, e.timeout) _, err := e.Version(context.Background()) if err != nil { @@ -35,7 +35,7 @@ func TestExec_timeout(t *testing.T) { func TestExec_Version(t *testing.T) { e := MockExecutor(&MockCall{ - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.12.0\n", ExitCode: 0, })("") @@ -52,7 +52,7 @@ func TestExec_Version(t *testing.T) { func TestExec_Format(t *testing.T) { expectedOutput := []byte("formatted config") e := MockExecutor(&MockCall{ - Args: []string{"fmt", "-no-color", "-"}, + Args: []string{"fmt", "-"}, Stdout: string(expectedOutput), ExitCode: 0, })("") @@ -70,7 +70,7 @@ func TestExec_Format(t *testing.T) { func TestExec_ProviderSchemas(t *testing.T) { e := MockExecutor(&MockCall{ - Args: []string{"providers", "-no-color", "schema", "-json"}, + Args: []string{"providers", "schema", "-json"}, Stdout: `{"format_version": "0.1"}`, ExitCode: 0, })("") diff --git a/internal/terraform/rootmodule/root_module_manager_mock_test.go b/internal/terraform/rootmodule/root_module_manager_mock_test.go index 830d0d72..aff0b352 100644 --- a/internal/terraform/rootmodule/root_module_manager_mock_test.go +++ b/internal/terraform/rootmodule/root_module_manager_mock_test.go @@ -27,11 +27,11 @@ func TestNewRootModuleManagerMock_mocks(t *testing.T) { TerraformExecQueue: &exec.MockQueue{ Q: []*exec.MockItem{ { - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.12.0\n", }, { - Args: []string{"providers", "-no-color", "schema", "-json"}, + Args: []string{"providers", "schema", "-json"}, Stdout: `{"format_version":"0.1"}` + "\n", }, }, diff --git a/internal/terraform/rootmodule/root_module_manager_test.go b/internal/terraform/rootmodule/root_module_manager_test.go index 292a9001..5dabb792 100644 --- a/internal/terraform/rootmodule/root_module_manager_test.go +++ b/internal/terraform/rootmodule/root_module_manager_test.go @@ -461,19 +461,19 @@ func testRootModuleManager(t *testing.T) *rootModuleManager { Q: []*exec.MockItem{ // TODO: Pass mock items as argument to make testing more accurate { - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.12.0\n", }, { - Args: []string{"providers", "-no-color", "schema", "-json"}, + Args: []string{"providers", "schema", "-json"}, Stdout: "{\"format_version\":\"0.1\"}\n", }, { - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.12.0\n", }, { - Args: []string{"providers", "-no-color", "schema", "-json"}, + Args: []string{"providers", "schema", "-json"}, Stdout: "{\"format_version\":\"0.1\"}\n", }, }, diff --git a/langserver/handlers/complete_test.go b/langserver/handlers/complete_test.go index d0c2cf76..717f4fb0 100644 --- a/langserver/handlers/complete_test.go +++ b/langserver/handlers/complete_test.go @@ -39,11 +39,11 @@ func TestCompletion_withValidData(t *testing.T) { TerraformExecQueue: &exec.MockQueue{ Q: []*exec.MockItem{ { - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.12.0\n", }, { - Args: []string{"providers", "-no-color", "schema", "-json"}, + Args: []string{"providers", "schema", "-json"}, Stdout: testSchemaOutput, }, }, diff --git a/langserver/handlers/formatting_test.go b/langserver/handlers/formatting_test.go index 43122aa4..cbe922e3 100644 --- a/langserver/handlers/formatting_test.go +++ b/langserver/handlers/formatting_test.go @@ -32,11 +32,11 @@ func TestLangServer_formatting_basic(t *testing.T) { ManagerTfExecQueue: &exec.MockQueue{ Q: []*exec.MockItem{ { - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.12.0\n", }, { - Args: []string{"fmt", "-no-color", "-"}, + Args: []string{"fmt", "-"}, Stdout: "provider \"test\" {\n\n}\n", }, }, diff --git a/langserver/handlers/handlers_test.go b/langserver/handlers/handlers_test.go index 130494f3..b94cc129 100644 --- a/langserver/handlers/handlers_test.go +++ b/langserver/handlers/handlers_test.go @@ -98,11 +98,11 @@ func validTfMockCalls() *exec.MockQueue { return &exec.MockQueue{ Q: []*exec.MockItem{ { - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.12.0\n", }, { - Args: []string{"providers", "-no-color", "schema", "-json"}, + Args: []string{"providers", "schema", "-json"}, Stdout: "{\"format_version\":\"0.1\"}\n", }, }, diff --git a/langserver/handlers/initialize_test.go b/langserver/handlers/initialize_test.go index 5f21ae15..87bb6e4b 100644 --- a/langserver/handlers/initialize_test.go +++ b/langserver/handlers/initialize_test.go @@ -40,7 +40,7 @@ func TestInitialize_withIncompatibleTerraformVersion(t *testing.T) { RootModules: map[string]*rootmodule.RootModuleMock{ tmpDir.Dir(): { TerraformExecQueue: &exec.MockCall{ - Args: []string{"version", "-no-color"}, + Args: []string{"version"}, Stdout: "Terraform v0.11.0\n", }, },