Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Pass -no-color to terraform" #227

Merged
merged 1 commit into from
Jul 10, 2020
Merged

Revert "Pass -no-color to terraform" #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion internal/terraform/exec/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions internal/terraform/exec/exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
})("")
Expand All @@ -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,
})("")
Expand All @@ -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,
})("")
Expand Down
4 changes: 2 additions & 2 deletions internal/terraform/rootmodule/root_module_manager_mock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
Expand Down
8 changes: 4 additions & 4 deletions internal/terraform/rootmodule/root_module_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
Expand Down
4 changes: 2 additions & 2 deletions langserver/handlers/complete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
},
Expand Down
4 changes: 2 additions & 2 deletions langserver/handlers/formatting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
Expand Down
4 changes: 2 additions & 2 deletions langserver/handlers/handlers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
Expand Down
2 changes: 1 addition & 1 deletion langserver/handlers/initialize_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
Expand Down