From ec4ed2072f2a01628ea3d98b26c6bd44c398150f Mon Sep 17 00:00:00 2001 From: Maurice Yap Date: Tue, 17 Mar 2026 16:57:58 +0000 Subject: [PATCH] Lookout: wrap ErrNotFound in GetJobSpec not-found error Replace github.com/pkg/errors with stdlib fmt.Errorf and wrap ErrNotFound so callers can use errors.Is to distinguish not-found from other errors. Signed-off-by: Maurice Yap --- internal/lookout/repository/getjobspec.go | 8 +++++--- internal/lookout/repository/getjobspec_test.go | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/lookout/repository/getjobspec.go b/internal/lookout/repository/getjobspec.go index ea1216e3a30..b73bd55da47 100644 --- a/internal/lookout/repository/getjobspec.go +++ b/internal/lookout/repository/getjobspec.go @@ -1,10 +1,12 @@ package repository import ( + "errors" + "fmt" + "github.com/gogo/protobuf/proto" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" - "github.com/pkg/errors" "github.com/armadaproject/armada/internal/common/armadacontext" "github.com/armadaproject/armada/internal/common/compress" @@ -39,8 +41,8 @@ func (r *SqlGetJobSpecRepository) GetJobSpec(ctx *armadacontext.Context, jobId s ON job.job_id = job_spec.job_id WHERE job.job_id = $1`, jobId).Scan(&rawBytes) if err != nil { - if err == pgx.ErrNoRows { - return nil, errors.Errorf("job_spec with job id %s not found", jobId) + if errors.Is(err, pgx.ErrNoRows) { + return nil, fmt.Errorf("job_spec with job id %s not found: %w", jobId, ErrNotFound) } return nil, err } diff --git a/internal/lookout/repository/getjobspec_test.go b/internal/lookout/repository/getjobspec_test.go index 0312ab9988b..1ee785edbb4 100644 --- a/internal/lookout/repository/getjobspec_test.go +++ b/internal/lookout/repository/getjobspec_test.go @@ -133,7 +133,7 @@ func TestGetJobSpecError(t *testing.T) { err := lookout.WithLookoutDb(func(db *pgxpool.Pool) error { repo := NewSqlGetJobSpecRepository(db, &compress.NoOpDecompressor{}) _, err := repo.GetJobSpec(armadacontext.TODO(), jobId) - assert.Error(t, err) + assert.ErrorIs(t, err, ErrNotFound) return nil }) assert.NoError(t, err)