fix: fix data race in echo provisioner (#17142)

aslilac · web-flow · commit ca414b031ac2 · 2025-03-27T18:04:05.000-06:00
diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go
@@ -254,7 +254,7 @@ func TarWithOptions(ctx context.Context, logger slog.Logger, responses *Response
 			continue
 		}
 
-		if len(plan.Plan) == 0 {
+		if plan.Error == "" && len(plan.Plan) == 0 {
 			plan.Plan = []byte("{}")
 		}
 	}
@@ -316,7 +316,7 @@ func TarWithOptions(ctx context.Context, logger slog.Logger, responses *Response
 		for i, resp := range m {
 			plan := resp.GetPlan()
 			if plan != nil {
-				if len(plan.Plan) == 0 {
+				if plan.Error == "" && len(plan.Plan) == 0 {
 					plan.Plan = []byte("{}")
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ func TarWithOptions(ctx context.Context, logger slog.Logger, responses *Response`
`254`	`254`	`continue`
`255`	`255`	`}`
`256`	`256`
`257`		`- if len(plan.Plan) == 0 {`
	`257`	`+ if plan.Error == "" && len(plan.Plan) == 0 {`
`258`	`258`	`plan.Plan = []byte("{}")`
`259`	`259`	`}`
`260`	`260`	`}`
`@@ -316,7 +316,7 @@ func TarWithOptions(ctx context.Context, logger slog.Logger, responses *Response`
`316`	`316`	`for i, resp := range m {`
`317`	`317`	`plan := resp.GetPlan()`
`318`	`318`	`if plan != nil {`
`319`		`- if len(plan.Plan) == 0 {`
	`319`	`+ if plan.Error == "" && len(plan.Plan) == 0 {`
`320`	`320`	`plan.Plan = []byte("{}")`
`321`	`321`	`}`
`322`	`322`	`}`