From 5b24b9e56ba824ed3f626751f9cb3f85552d7f86 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Thu, 4 Jul 2024 14:28:57 +0000 Subject: [PATCH] Fix shadowing bug in job create function Signed-off-by: Gabriel Adrian Samfira --- database/sql/jobs.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/sql/jobs.go b/database/sql/jobs.go index f3c8ae72..2dfadf13 100644 --- a/database/sql/jobs.go +++ b/database/sql/jobs.go @@ -216,6 +216,7 @@ func (s *sqlDatabase) UnlockJob(_ context.Context, jobID int64, entityID string) func (s *sqlDatabase) CreateOrUpdateJob(ctx context.Context, job params.Job) (params.Job, error) { var workflowJob WorkflowJob + var err error q := s.conn.Clauses(clause.Locking{Strength: "UPDATE"}).Preload("Instance").Where("id = ?", job.ID).First(&workflowJob) if q.Error != nil { @@ -267,7 +268,7 @@ func (s *sqlDatabase) CreateOrUpdateJob(ctx context.Context, job params.Job) (pa } else { operation = common.CreateOperation - workflowJob, err := s.paramsJobToWorkflowJob(ctx, job) + workflowJob, err = s.paramsJobToWorkflowJob(ctx, job) if err != nil { return params.Job{}, errors.Wrap(err, "converting job") }