Commit2a76f50

authored

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

1 parentfeb1a3d commit2a76f50Copy full SHA for 2a76f50

File tree

-7

lines changed

-7

lines changed

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1417,13 +1417,15 @@ func (s server) CompleteJob(ctx context.Context, completed proto.CompletedJob)`
`1417`	`1417`	`returnnil,xerrors.Errorf("update template version external auth providers: %w",err)`
`1418`	`1418`	`}`
`1419`	`1419`
`1420`		`-err=s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{`
`1421`		`-JobID:jobID,`
`1422`		`-CachedPlan:jobType.TemplateImport.Plan,`
`1423`		`-UpdatedAt:now,`
`1424`		`-})`
`1425`		`-iferr!=nil {`
`1426`		`-returnnil,xerrors.Errorf("insert template version terraform data: %w",err)`
	`1420`	`+iflen(jobType.TemplateImport.Plan)>0 {`
	`1421`	`+err:=s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{`
	`1422`	`+JobID:jobID,`
	`1423`	`+CachedPlan:jobType.TemplateImport.Plan,`
	`1424`	`+UpdatedAt:now,`
	`1425`	`+})`
	`1426`	`+iferr!=nil {`
	`1427`	`+returnnil,xerrors.Errorf("insert template version terraform data: %w",err)`
	`1428`	`+}`
`1427`	`1429`	`}`
`1428`	`1430`
`1429`	`1431`	`err=s.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{`

Comments

(0)