fix: use -no-color when calling terraform show state (#4812)

coadler · web-flow · commit 1bd67b806403 · 2022-10-31T13:03:59.000-05:00
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -342,7 +342,7 @@ func (e executor) stateResources(ctx, killCtx context.Context) ([]*proto.Resourc
 }
 
 func (e executor) state(ctx, killCtx context.Context) (*tfjson.State, error) {
-	args := []string{"show", "-json"}
+	args := []string{"show", "-json", "-no-color"}
 	state := &tfjson.State{}
 	err := e.execParseJSON(ctx, killCtx, args, e.basicEnv(), state)
 	if err != nil {
diff --git a/provisionerd/runner/runner.go b/provisionerd/runner/runner.go
@@ -233,6 +233,9 @@ func (r *Runner) ForceStop() {
 }
 
 func (r *Runner) update(ctx context.Context, u *proto.UpdateJobRequest) (*proto.UpdateJobResponse, error) {
+	ctx, span := r.startTrace(ctx, tracing.FuncName())
+	defer span.End()
+
 	r.mutex.Lock()
 	defer r.mutex.Unlock()
 	if !r.okToSend {
@@ -248,9 +251,6 @@ func (r *Runner) doCleanFinish(ctx context.Context) {
 		completedJob *proto.CompletedJob
 	)
 
-	ctx, span := r.startTrace(ctx, tracing.FuncName())
-	defer span.End()
-
 	// push the fail/succeed write onto the defer stack before the cleanup, so
 	// that cleanup happens before this.
 	defer func() {

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ func (e executor) stateResources(ctx, killCtx context.Context) ([]*proto.Resourc`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`func (e executor) state(ctx, killCtx context.Context) (*tfjson.State, error) {`
`345`		`- args := []string{"show", "-json"}`
	`345`	`+ args := []string{"show", "-json", "-no-color"}`
`346`	`346`	`state := &tfjson.State{}`
`347`	`347`	`err := e.execParseJSON(ctx, killCtx, args, e.basicEnv(), state)`
`348`	`348`	`if err != nil {`