From 4341b4869c4c720ad2bb7a6d7cd3c1b2c955aa10 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Thu, 21 Aug 2025 18:57:42 +0000 Subject: [PATCH] Fix erroneous calls to Job related functions Some functions were left behind when we added WorkflowJobID. Signed-off-by: Gabriel Adrian Samfira --- database/sql/jobs.go | 2 +- database/watcher/watcher_store_test.go | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/database/sql/jobs.go b/database/sql/jobs.go index c37cdd45..ffa3a7b5 100644 --- a/database/sql/jobs.go +++ b/database/sql/jobs.go @@ -248,7 +248,7 @@ func (s *sqlDatabase) CreateOrUpdateJob(ctx context.Context, job params.Job) (pa var err error searchField := "workflow_job_id = ?" - var searchVal any = job.ID + var searchVal any = job.WorkflowJobID if job.ScaleSetJobID != "" { searchField = "scale_set_job_id = ?" searchVal = job.ScaleSetJobID diff --git a/database/watcher/watcher_store_test.go b/database/watcher/watcher_store_test.go index a71ed1cf..97fc8a9d 100644 --- a/database/watcher/watcher_store_test.go +++ b/database/watcher/watcher_store_test.go @@ -50,12 +50,12 @@ func (s *WatcherStoreTestSuite) TestJobWatcher() { consumeEvents(consumer) jobParams := params.Job{ - ID: 1, - RunID: 2, - Action: "test-action", - Conclusion: "started", - Status: "in_progress", - Name: "test-job", + WorkflowJobID: 2, + RunID: 2, + Action: "test-action", + Conclusion: "started", + Status: "in_progress", + Name: "test-job", } job, err := s.store.CreateOrUpdateJob(s.ctx, jobParams) @@ -76,8 +76,8 @@ func (s *WatcherStoreTestSuite) TestJobWatcher() { s.T().Fatal("expected payload not received") } - jobParams.Conclusion = "success" - updatedJob, err := s.store.CreateOrUpdateJob(s.ctx, jobParams) + job.Conclusion = "success" + updatedJob, err := s.store.CreateOrUpdateJob(s.ctx, job) s.Require().NoError(err) select { @@ -94,7 +94,7 @@ func (s *WatcherStoreTestSuite) TestJobWatcher() { entityID, err := uuid.NewUUID() s.Require().NoError(err) - err = s.store.LockJob(s.ctx, updatedJob.ID, entityID.String()) + err = s.store.LockJob(s.ctx, updatedJob.WorkflowJobID, entityID.String()) s.Require().NoError(err) select { @@ -110,7 +110,7 @@ func (s *WatcherStoreTestSuite) TestJobWatcher() { s.T().Fatal("expected payload not received") } - err = s.store.UnlockJob(s.ctx, updatedJob.ID, entityID.String()) + err = s.store.UnlockJob(s.ctx, updatedJob.WorkflowJobID, entityID.String()) s.Require().NoError(err) select { @@ -134,7 +134,7 @@ func (s *WatcherStoreTestSuite) TestJobWatcher() { // We don't care about the update event here. consumeEvents(consumer) - err = s.store.BreakLockJobIsQueued(s.ctx, updatedJob.ID) + err = s.store.BreakLockJobIsQueued(s.ctx, updatedJob.WorkflowJobID) s.Require().NoError(err) select {