From f2eb0723daa854baf70bb9619099403723bc8caa Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Tue, 17 Sep 2024 12:07:32 +0000 Subject: [PATCH 1/2] fix(coderd): check if timings can be read --- coderd/database/dbauthz/dbauthz.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go index 0e3b0fe134f06..243e39487f71e 100644 --- a/coderd/database/dbauthz/dbauthz.go +++ b/coderd/database/dbauthz/dbauthz.go @@ -1792,6 +1792,10 @@ func (q *querier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (data } func (q *querier) GetProvisionerJobTimingsByJobID(ctx context.Context, jobID uuid.UUID) ([]database.ProvisionerJobTiming, error) { + _, err := q.GetProvisionerJobByID(ctx, jobID) + if err != nil { + return nil, err + } return q.db.GetProvisionerJobTimingsByJobID(ctx, jobID) } From a9b2976e37a4cc164dd3eb42a07ae81100848a77 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Tue, 17 Sep 2024 12:31:53 +0000 Subject: [PATCH 2/2] Try to fix dbauthz test --- coderd/database/dbauthz/dbauthz_test.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go index 3e0c602949a19..5cbec26623efc 100644 --- a/coderd/database/dbauthz/dbauthz_test.go +++ b/coderd/database/dbauthz/dbauthz_test.go @@ -552,10 +552,13 @@ func (s *MethodTestSuite) TestProvisionerJob() { Asserts(v.RBACObject(tpl), []policy.Action{policy.ActionRead, policy.ActionUpdate}).Returns() })) s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) { - jobID := uuid.New() - j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{ID: jobID}) + w := dbgen.Workspace(s.T(), db, database.Workspace{}) + j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{ + Type: database.ProvisionerJobTypeWorkspaceBuild, + }) + _ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID}) t := dbgen.ProvisionerJobTimings(s.T(), db, database.InsertProvisionerJobTimingsParams{ - JobID: jobID, + JobID: j.ID, StartedAt: []time.Time{dbtime.Now(), dbtime.Now()}, EndedAt: []time.Time{dbtime.Now(), dbtime.Now()}, Stage: []database.ProvisionerJobTimingStage{ @@ -566,7 +569,7 @@ func (s *MethodTestSuite) TestProvisionerJob() { Action: []string{"action1", "action2"}, Resource: []string{"resource1", "resource2"}, }) - check.Args(j.ID).Asserts().Returns(t) + check.Args(j.ID).Asserts(w, policy.ActionRead).Returns(t) })) s.Run("GetProvisionerJobsByIDs", s.Subtest(func(db database.Store, check *expects) { a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})