From ca414b031ac2f1d6eebc529894baadff627510d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B1=E3=82=A4=E3=83=A9?= <mckayla@hey.com>
Date: Thu, 27 Mar 2025 17:04:05 -0700
Subject: [PATCH] fix: fix data race in echo provisioner (#17142)

---
 provisioner/echo/serve.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go
index fa35b2d399..174aba65c7 100644
--- 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("{}")
 				}
 			}