add colors flag

Author: digitalkaoz

tfexec/apply.go

@@ -106,7 +106,7 @@ func (tf *Terraform) applyCmd(ctx context.Context, opts ...ApplyOption) (*exec.C
 		o.configureApply(&c)
 	}
 
-	args := []string{"apply", "-no-color", "-auto-approve", "-input=false"}
+	args := []string{"apply", "-auto-approve", "-input=false"}
 
 	// string opts: only pass if set
 	if c.backup != "" {

tfexec/apply_test.go

@@ -43,7 +43,6 @@ func TestApplyCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"apply",
-			"-no-color",
 			"-auto-approve",
 			"-input=false",
 			"-backup=testbackup",
@@ -62,6 +61,7 @@ func TestApplyCmd(t *testing.T) {
 			"-var", "var1=foo",
 			"-var", "var2=bar",
 			"testfile",
+			"-no-color",
 		}, nil, applyCmd)
 	})
 }

tfexec/cmd.go

@@ -180,7 +180,11 @@ func (tf *Terraform) buildEnv(mergeEnv map[string]string) []string {
 }
 
 func (tf *Terraform) buildTerraformCmd(ctx context.Context, mergeEnv map[string]string, args ...string) *exec.Cmd {
-	cmd := exec.CommandContext(ctx, tf.execPath, args...)
+	if !tf.colors {
+		args = append(args, "-no-color")
+	}
+
+	cmd := exec.Command(tf.execPath, args...)
 
 	cmd.Env = tf.buildEnv(mergeEnv)
 	cmd.Dir = tf.workingDir

tfexec/destroy.go

@@ -102,7 +102,7 @@ func (tf *Terraform) destroyCmd(ctx context.Context, opts ...DestroyOption) (*ex
 		o.configureDestroy(&c)
 	}
 
-	args := []string{"destroy", "-no-color", "-auto-approve", "-input=false"}
+	args := []string{"destroy", "-auto-approve", "-input=false"}
 
 	// string opts: only pass if set
 	if c.backup != "" {

tfexec/destroy_test.go

@@ -26,13 +26,13 @@ func TestDestroyCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"destroy",
-			"-no-color",
 			"-auto-approve",
 			"-input=false",
 			"-lock-timeout=0s",
 			"-lock=true",
 			"-parallelism=10",
 			"-refresh=true",
+			"-no-color",
 		}, nil, destroyCmd)
 	})
 
@@ -44,7 +44,6 @@ func TestDestroyCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"destroy",
-			"-no-color",
 			"-auto-approve",
 			"-input=false",
 			"-backup=testbackup",
@@ -60,6 +59,7 @@ func TestDestroyCmd(t *testing.T) {
 			"-var", "var1=foo",
 			"-var", "var2=bar",
 			"destroydir",
+			"-no-color",
 		}, nil, destroyCmd)
 	})
 }

tfexec/fmt.go

@@ -145,7 +145,7 @@ func (tf *Terraform) formatCmd(ctx context.Context, args []string, opts ...Forma
 		o.configureFormat(&c)
 	}
 
-	args = append([]string{"fmt", "-no-color"}, args...)
+	args = append([]string{"fmt"}, args...)
 
 	if c.recursive {
 		args = append(args, "-recursive")

tfexec/get.go

@@ -40,7 +40,7 @@ func (tf *Terraform) getCmd(ctx context.Context, opts ...GetCmdOption) (*exec.Cm
 		o.configureGet(&c)
 	}
 
-	args := []string{"get", "-no-color"}
+	args := []string{"get"}
 
 	args = append(args, "-update="+fmt.Sprint(c.update))
 

tfexec/get_test.go

@@ -26,8 +26,8 @@ func TestGetCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"get",
-			"-no-color",
 			"-update=false",
+			"-no-color",
 		}, nil, getCmd)
 	})
 }

tfexec/graph_test.go

@@ -28,6 +28,7 @@ func TestGraphCmd_v013(t *testing.T) {
 
 		assertCmd(t, []string{
 			"graph",
+			"-no-color",
 		}, nil, graphCmd)
 	})
 
@@ -42,6 +43,7 @@ func TestGraphCmd_v013(t *testing.T) {
 			"teststate",
 			"-draw-cycles",
 			"-type=output",
+			"-no-color",
 		}, nil, graphCmd)
 	})
 }
@@ -62,6 +64,7 @@ func TestGraphCmd_v1(t *testing.T) {
 
 		assertCmd(t, []string{
 			"graph",
+			"-no-color",
 		}, nil, graphCmd)
 	})
 
@@ -76,6 +79,7 @@ func TestGraphCmd_v1(t *testing.T) {
 			"-plan=teststate",
 			"-draw-cycles",
 			"-type=output",
+			"-no-color",
 		}, nil, graphCmd)
 	})
 }

tfexec/import.go

@@ -88,7 +88,7 @@ func (tf *Terraform) importCmd(ctx context.Context, address, id string, opts ...
 		o.configureImport(&c)
 	}
 
-	args := []string{"import", "-no-color", "-input=false"}
+	args := []string{"import", "-input=false"}
 
 	// string opts: only pass if set
 	if c.backup != "" {