chore: fix race condition on aggregating terraform logs

Emyrk · Emyrk · commit b1f75f36e8c0 · 2025-12-02T19:03:35.000Z
The logs could be aggregated before all cmd output was read
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -386,6 +386,8 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l
 		}
 	}
 
+	// DoneOut must be completed before we aggregate timings to ensure all logs have been processed.
+	<-doneOut
 	msg := &proto.PlanComplete{
 		Parameters:            state.Parameters,
 		Resources:             state.Resources,
@@ -617,6 +619,8 @@ func (e *executor) apply(
 		return nil, xerrors.Errorf("read statefile %q: %w", statefilePath, err)
 	}
 
+	// DoneOut must be completed before we aggregate timings to ensure all logs have been processed.
+	<-doneOut
 	agg := e.timings.aggregate()
 	return &proto.ApplyComplete{
 		Parameters:            state.Parameters,

Original file line number	Diff line number	Diff line change
`@@ -386,6 +386,8 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l`
`386`	`386`	`}`
`387`	`387`	`}`
`388`	`388`
	`389`	`+ // DoneOut must be completed before we aggregate timings to ensure all logs have been processed.`
	`390`	`+ <-doneOut`
`389`	`391`	`msg := &proto.PlanComplete{`
`390`	`392`	`Parameters: state.Parameters,`
`391`	`393`	`Resources: state.Resources,`
`@@ -617,6 +619,8 @@ func (e *executor) apply(`
`617`	`619`	`return nil, xerrors.Errorf("read statefile %q: %w", statefilePath, err)`
`618`	`620`	`}`
`619`	`621`
	`622`	`+ // DoneOut must be completed before we aggregate timings to ensure all logs have been processed.`
	`623`	`+ <-doneOut`
`620`	`624`	`agg := e.timings.aggregate()`
`621`	`625`	`return &proto.ApplyComplete{`
`622`	`626`	`Parameters: state.Parameters,`