add changelog entry

Author: digitalkaoz

CHANGELOG.md

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

tfexec/apply_test.go

@@ -181,10 +181,10 @@ func (tf *Terraform) buildEnv(mergeEnv map[string]string) []string {
 
 func (tf *Terraform) buildTerraformCmd(ctx context.Context, mergeEnv map[string]string, args ...string) *exec.Cmd {
 	if !tf.colors {
-		args = append(args, "-no-color")
+		args = addColorFlag(args)
 	}
 
-	cmd := exec.Command(tf.execPath, args...)
+	cmd := exec.CommandContext(ctx, tf.execPath, args...)
 
 	cmd.Env = tf.buildEnv(mergeEnv)
 	cmd.Dir = tf.workingDir
@@ -194,6 +194,36 @@ func (tf *Terraform) buildTerraformCmd(ctx context.Context, mergeEnv map[string]
 	return cmd
 }
 
+func addColorFlag(args []string) []string {
+	found := false
+	insertIndex := 0
+	for i, a := range args {
+		if strings.HasPrefix(a, "-") && insertIndex == 0 {
+			insertIndex = i
+		}
+
+		if a == "-no-color" {
+			found = true
+		}
+	}
+	if insertIndex == 0 {
+		insertIndex = len(args)
+	}
+	if !found {
+		args = insert(args, insertIndex, "-no-color")
+	}
+	return args
+}
+
+func insert(a []string, index int, value string) []string {
+	if len(a) == index {
+		return append(a, value)
+	}
+	a = append(a[:index+1], a[index:]...)
+	a[index] = value
+	return a
+}
+
 func (tf *Terraform) runTerraformCmdJSON(ctx context.Context, cmd *exec.Cmd, v interface{}) error {
 	var outbuf = bytes.Buffer{}
 	cmd.Stdout = mergeWriters(cmd.Stdout, &outbuf)

tfexec/cmd.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,6 +44,7 @@ func TestDestroyCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"destroy",
+			"-no-color",
 			"-auto-approve",
 			"-input=false",
 			"-backup=testbackup",
@@ -59,7 +60,6 @@ func TestDestroyCmd(t *testing.T) {
 			"-var", "var1=foo",
 			"-var", "var2=bar",
 			"destroydir",
-			"-no-color",
 		}, nil, destroyCmd)
 	})
 }

tfexec/destroy_test.go

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

tfexec/get_test.go

@@ -41,9 +41,9 @@ func TestGraphCmd_v013(t *testing.T) {
 		assertCmd(t, []string{
 			"graph",
 			"teststate",
+			"-no-color",
 			"-draw-cycles",
 			"-type=output",
-			"-no-color",
 		}, nil, graphCmd)
 	})
 }
@@ -76,10 +76,10 @@ func TestGraphCmd_v1(t *testing.T) {
 
 		assertCmd(t, []string{
 			"graph",
+			"-no-color",
 			"-plan=teststate",
 			"-draw-cycles",
 			"-type=output",
-			"-no-color",
 		}, nil, graphCmd)
 	})
 }

tfexec/graph_test.go

@@ -26,12 +26,12 @@ func TestImportCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"import",
+			"-no-color",
 			"-input=false",
 			"-lock-timeout=0s",
 			"-lock=true",
 			"my-addr",
 			"my-id",
-			"-no-color",
 		}, nil, importCmd)
 	})
 
@@ -53,6 +53,7 @@ func TestImportCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"import",
+			"-no-color",
 			"-input=false",
 			"-backup=testbackup",
 			"-lock-timeout=200s",
@@ -65,7 +66,6 @@ func TestImportCmd(t *testing.T) {
 			"-var", "var2=bar",
 			"my-addr2",
 			"my-id2",
-			"-no-color",
 		}, nil, importCmd)
 	})
 }

tfexec/import_test.go

@@ -32,6 +32,7 @@ func TestInitCmd_v012(t *testing.T) {
 
 		assertCmd(t, []string{
 			"init",
+			"-no-color",
 			"-force-copy",
 			"-input=false",
 			"-lock-timeout=0s",
@@ -41,7 +42,6 @@ func TestInitCmd_v012(t *testing.T) {
 			"-lock=true",
 			"-get-plugins=true",
 			"-verify-plugins=true",
-			"-no-color",
 		}, nil, initCmd)
 	})
 
@@ -53,6 +53,7 @@ func TestInitCmd_v012(t *testing.T) {
 
 		assertCmd(t, []string{
 			"init",
+			"-no-color",
 			"-force-copy",
 			"-input=false",
 			"-from-module=testsource",
@@ -70,7 +71,6 @@ func TestInitCmd_v012(t *testing.T) {
 			"-plugin-dir=testdir1",
 			"-plugin-dir=testdir2",
 			"initdir",
-			"-no-color",
 		}, nil, initCmd)
 	})
 }

tfexec/init_test.go

@@ -23,8 +23,8 @@ func TestOutputCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"output",
-			"-json",
 			"-no-color",
+			"-json",
 		}, nil, outputCmd)
 	})
 
@@ -34,9 +34,9 @@ func TestOutputCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"output",
+			"-no-color",
 			"-json",
 			"-state=teststate",
-			"-no-color",
 		}, nil, outputCmd)
 	})
 }

tfexec/output_test.go

@@ -26,13 +26,13 @@ func TestPlanCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"plan",
+			"-no-color",
 			"-input=false",
 			"-detailed-exitcode",
 			"-lock-timeout=0s",
 			"-lock=true",
 			"-parallelism=10",
 			"-refresh=true",
-			"-no-color",
 		}, nil, planCmd)
 	})
 
@@ -59,6 +59,7 @@ func TestPlanCmd(t *testing.T) {
 
 		assertCmd(t, []string{
 			"plan",
+			"-no-color",
 			"-input=false",
 			"-detailed-exitcode",
 			"-lock-timeout=22s",
@@ -76,7 +77,6 @@ func TestPlanCmd(t *testing.T) {
 			"-var", "android=paranoid",
 			"-var", "brain_size=planet",
 			"earth",
-			"-no-color",
 		}, nil, planCmd)
 	})
 }