DevFW-CICD/garm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(jobs): Correctly handle workflow job IDs from webhooks

Browse source
This commit is contained in:
igrikus 2025-08-21 14:54:38 +02:00
parent 004c03962f
commit 8bda81d6cc
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
database/sql/jobs.go
View file

@ -79,7 +79,7 @@ func (s *sqlDatabase) paramsJobToWorkflowJob(ctx context.Context, job params.Job
workflofJob := WorkflowJob{ workflofJob := WorkflowJob{
ScaleSetJobID: job.ScaleSetJobID, ScaleSetJobID: job.ScaleSetJobID,
WorkflowJobID: job.ID, WorkflowJobID: job.WorkflowJobID,
RunID: job.RunID, RunID: job.RunID,
Action: job.Action, Action: job.Action,
Status: job.Status, Status: job.Status,
@ -149,7 +149,7 @@ func (s *sqlDatabase) LockJob(_ context.Context, jobID int64, entityID string) e
return fmt.Errorf("error parsing entity id: %w", err) return fmt.Errorf("error parsing entity id: %w", err)
} }
var workflowJob WorkflowJob var workflowJob WorkflowJob
q := s.conn.Preload("Instance").Where("id = ?", jobID).First(&workflowJob) q := s.conn.Preload("Instance").Where("workflow_job_id = ?", jobID).First(&workflowJob)
if q.Error != nil { if q.Error != nil {
if errors.Is(q.Error, gorm.ErrRecordNotFound) { if errors.Is(q.Error, gorm.ErrRecordNotFound) {