hi steven

aslilac · aslilac · commit 295bceb9466c · 2025-03-21T16:45:23.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -8837,6 +8837,10 @@ func (q *FakeQuerier) InsertTemplateVersionTerraformValuesByJobID(_ context.Cont
 		return sql.ErrNoRows
 	}
 
+	if !json.Valid(arg.CachedPlan) {
+		return xerrors.Errorf("cached plan must be valid json, received %q", string(arg.CachedPlan))
+	}
+
 	// Insert the new row
 	row := database.TemplateVersionTerraformValue{
 		TemplateVersionID: templateVersion.ID,
diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go
@@ -51,7 +51,9 @@ var (
 	// PlanComplete is a helper to indicate an empty provision completion.
 	PlanComplete = []*proto.Response{{
 		Type: &proto.Response_Plan{
-			Plan: &proto.PlanComplete{},
+			Plan: &proto.PlanComplete{
+				Plan: []byte("{}"),
+			},
 		},
 	}}
 	// ApplyComplete is a helper to indicate an empty provision completion.
@@ -240,11 +242,23 @@ func TarWithOptions(ctx context.Context, logger slog.Logger, responses *Response
 					Resources:             resp.GetApply().GetResources(),
 					Parameters:            resp.GetApply().GetParameters(),
 					ExternalAuthProviders: resp.GetApply().GetExternalAuthProviders(),
+					Plan:                  []byte("{}"),
 				}},
 			})
 		}
 	}
 
+	for _, resp := range responses.ProvisionPlan {
+		plan := resp.GetPlan()
+		if plan == nil {
+			continue
+		}
+
+		if len(plan.Plan) == 0 {
+			plan.Plan = []byte("{}")
+		}
+	}
+
 	var buffer bytes.Buffer
 	writer := tar.NewWriter(&buffer)
 
@@ -322,6 +336,7 @@ func WithResources(resources []*proto.Resource) *Responses {
 		}}}},
 		ProvisionPlan: []*proto.Response{{Type: &proto.Response_Plan{Plan: &proto.PlanComplete{
 			Resources: resources,
+			Plan:      []byte("{}"),
 		}}}},
 	}
 }
