From 2f2ff62411345da1ace70d0e867a5e91dd96c3cc Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Tue, 6 May 2025 20:59:41 +0000 Subject: [PATCH] Deduplicate code Signed-off-by: Gabriel Adrian Samfira --- runner/pool/pool.go | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/runner/pool/pool.go b/runner/pool/pool.go index 73a0b0fa..3e96d1e9 100644 --- a/runner/pool/pool.go +++ b/runner/pool/pool.go @@ -162,8 +162,11 @@ func (r *basePoolManager) HandleWorkflowJob(job params.WorkflowJob) error { return nil } - var jobParams params.Job - var err error + jobParams, err := r.paramsWorkflowJobToParamsJob(job) + if err != nil { + return errors.Wrap(err, "converting job to params") + } + var triggeredBy int64 defer func() { if jobParams.ID == 0 { @@ -213,16 +216,7 @@ func (r *basePoolManager) HandleWorkflowJob(job params.WorkflowJob) error { case "queued": // Record the job in the database. Queued jobs will be picked up by the consumeQueuedJobs() method // when reconciling. - jobParams, err = r.paramsWorkflowJobToParamsJob(job) - if err != nil { - return errors.Wrap(err, "converting job to params") - } case "completed": - jobParams, err = r.paramsWorkflowJobToParamsJob(job) - if err != nil { - return errors.Wrap(err, "converting job to params") - } - // If job was not assigned to a runner, we can ignore it. if jobParams.RunnerName == "" { slog.InfoContext( @@ -263,11 +257,6 @@ func (r *basePoolManager) HandleWorkflowJob(job params.WorkflowJob) error { return errors.Wrap(err, "updating runner") } case "in_progress": - jobParams, err = r.paramsWorkflowJobToParamsJob(job) - if err != nil { - return errors.Wrap(err, "converting job to params") - } - fromCache, ok := cache.GetInstanceCache(jobParams.RunnerName) if !ok { slog.DebugContext(r.ctx, "instance not found in cache", "runner_name", jobParams.RunnerName)