yeah that's probably fine actually

aslilac · aslilac · commit 6a92c6e25cad · 2025-03-21T17:02:15.000Z
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -1265,7 +1265,8 @@ func (s *MethodTestSuite) TestTemplate() {
 		job := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
 		_ = dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{JobID: job.ID})
 		check.Args(database.InsertTemplateVersionTerraformValuesByJobIDParams{
-			JobID: job.ID,
+			JobID:      job.ID,
+			CachedPlan: []byte("{}"),
 		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 	}))
 	s.Run("SoftDeleteTemplateByID", s.Subtest(func(db database.Store, check *expects) {
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
@@ -1060,6 +1060,7 @@ func TestCompleteJob(t *testing.T) {
 						ExternalAuthProviders: []*sdkproto.ExternalAuthProviderResource{{
 							Id: "github",
 						}},
+						Plan: []byte("{}"),
 					},
 				},
 			})
@@ -1115,6 +1116,7 @@ func TestCompleteJob(t *testing.T) {
 						}},
 						StopResources:         []*sdkproto.Resource{},
 						ExternalAuthProviders: []*sdkproto.ExternalAuthProviderResource{{Id: "github"}},
+						Plan:                  []byte("{}"),
 					},
 				},
 			})
@@ -1523,6 +1525,7 @@ func TestCompleteJob(t *testing.T) {
 									Source:  "github.com/example2/example",
 								},
 							},
+							Plan: []byte("{}"),
 						},
 					},
 				},
diff --git a/provisioner/echo/serve.go b/provisioner/echo/serve.go
@@ -313,8 +313,15 @@ func TarWithOptions(ctx context.Context, logger slog.Logger, responses *Response
 		}
 	}
 	for trans, m := range responses.ProvisionPlanMap {
-		for i, rs := range m {
-			err := writeProto(fmt.Sprintf("%d.%s.plan.protobuf", i, strings.ToLower(trans.String())), rs)
+		for i, resp := range m {
+			plan := resp.GetPlan()
+			if plan != nil {
+				if len(plan.Plan) == 0 {
+					plan.Plan = []byte("{}")
+				}
+			}
+
+			err := writeProto(fmt.Sprintf("%d.%s.plan.protobuf", i, strings.ToLower(trans.String())), resp)
 			if err != nil {
 				return nil, err
 			}

Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,15 @@ func TarWithOptions(ctx context.Context, logger slog.Logger, responses *Response`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`	`for trans, m := range responses.ProvisionPlanMap {`
`316`		`- for i, rs := range m {`
`317`		`- err := writeProto(fmt.Sprintf("%d.%s.plan.protobuf", i, strings.ToLower(trans.String())), rs)`
	`316`	`+ for i, resp := range m {`
	`317`	`+ plan := resp.GetPlan()`
	`318`	`+ if plan != nil {`
	`319`	`+ if len(plan.Plan) == 0 {`
	`320`	`+ plan.Plan = []byte("{}")`
	`321`	`+ }`
	`322`	`+ }`
	`323`	`+`
	`324`	`+ err := writeProto(fmt.Sprintf("%d.%s.plan.protobuf", i, strings.ToLower(trans.String())), resp)`
`318`	`325`	`if err != nil {`
`319`	`326`	`return nil, err`
`320`	`327`	`}`