fix: don't attempt to insert empty terraform plans into the database (#17426)

This commit is contained in:
ケイラ
2025-04-16 09:14:35 -07:00
committed by GitHub
parent feb1a3dc02
commit 2a76f5028e

View File

@ -1417,7 +1417,8 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
return nil, xerrors.Errorf("update template version external auth providers: %w", err) return nil, xerrors.Errorf("update template version external auth providers: %w", err)
} }
err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{ if len(jobType.TemplateImport.Plan) > 0 {
err := s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
JobID: jobID, JobID: jobID,
CachedPlan: jobType.TemplateImport.Plan, CachedPlan: jobType.TemplateImport.Plan,
UpdatedAt: now, UpdatedAt: now,
@ -1425,6 +1426,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
if err != nil { if err != nil {
return nil, xerrors.Errorf("insert template version terraform data: %w", err) return nil, xerrors.Errorf("insert template version terraform data: %w", err)
} }
}
err = s.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{ err = s.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{
ID: jobID, ID: jobID,