Skip to content

Commit 9b3c7d7

Browse files
fix: don't attempt to insert empty terraform plans into the database (cherry-pick #17426) (#17486)
Co-authored-by: ケイラ <mckayla@hey.com>
1 parent b760f1d commit 9b3c7d7

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

coderd/provisionerdserver/provisionerdserver.go

+9-7
Original file line numberDiff line numberDiff line change
@@ -1415,13 +1415,15 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
14151415
return nil, xerrors.Errorf("update template version external auth providers: %w", err)
14161416
}
14171417

1418-
err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
1419-
JobID: jobID,
1420-
CachedPlan: jobType.TemplateImport.Plan,
1421-
UpdatedAt: now,
1422-
})
1423-
if err != nil {
1424-
return nil, xerrors.Errorf("insert template version terraform data: %w", err)
1418+
if len(jobType.TemplateImport.Plan) > 0 {
1419+
err := s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
1420+
JobID: jobID,
1421+
CachedPlan: jobType.TemplateImport.Plan,
1422+
UpdatedAt: now,
1423+
})
1424+
if err != nil {
1425+
return nil, xerrors.Errorf("insert template version terraform data: %w", err)
1426+
}
14251427
}
14261428

14271429
err = s.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{

0 commit comments

Comments
 (0)