Skip to content

Commit 4351529

Browse files
ibetitsmikeibetitsmike
committed
WIP
1 parent 77be34e commit 4351529

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,9 +1088,9 @@ func (q *querier) AcquireNotificationMessages(ctx context.Context, arg database.
10881088
}
10891089

10901090
func (q *querier) AcquireProvisionerJob(ctx context.Context, arg database.AcquireProvisionerJobParams) (database.ProvisionerJob, error) {
1091-
// if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
1092-
// return database.ProvisionerJob{}, err
1093-
// }
1091+
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
1092+
return database.ProvisionerJob{}, err
1093+
}
10941094
return q.db.AcquireProvisionerJob(ctx, arg)
10951095
}
10961096

@@ -3559,9 +3559,9 @@ func (q *querier) InsertProvisionerJobLogs(ctx context.Context, arg database.Ins
35593559
}
35603560

35613561
func (q *querier) InsertProvisionerJobTimings(ctx context.Context, arg database.InsertProvisionerJobTimingsParams) ([]database.ProvisionerJobTiming, error) {
3562-
// if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
3563-
// return nil, err
3564-
// }
3562+
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
3563+
return nil, err
3564+
}
35653565
return q.db.InsertProvisionerJobTimings(ctx, arg)
35663566
}
35673567

@@ -4185,9 +4185,9 @@ func (q *querier) UpdateProvisionerDaemonLastSeenAt(ctx context.Context, arg dat
41854185
}
41864186

41874187
func (q *querier) UpdateProvisionerJobByID(ctx context.Context, arg database.UpdateProvisionerJobByIDParams) error {
4188-
// if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
4189-
// return err
4190-
// }
4188+
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
4189+
return err
4190+
}
41914191
return q.db.UpdateProvisionerJobByID(ctx, arg)
41924192
}
41934193

@@ -4263,16 +4263,16 @@ func (q *querier) UpdateProvisionerJobWithCancelByID(ctx context.Context, arg da
42634263
}
42644264

42654265
func (q *querier) UpdateProvisionerJobWithCompleteByID(ctx context.Context, arg database.UpdateProvisionerJobWithCompleteByIDParams) error {
4266-
// if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
4267-
// return err
4268-
// }
4266+
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
4267+
return err
4268+
}
42694269
return q.db.UpdateProvisionerJobWithCompleteByID(ctx, arg)
42704270
}
42714271

42724272
func (q *querier) UpdateProvisionerJobWithCompleteWithStartedAtByID(ctx context.Context, arg database.UpdateProvisionerJobWithCompleteWithStartedAtByIDParams) error {
4273-
// if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
4274-
// return err
4275-
// }
4273+
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerJobs); err != nil {
4274+
return err
4275+
}
42764276
return q.db.UpdateProvisionerJobWithCompleteWithStartedAtByID(ctx, arg)
42774277
}
42784278

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4026,26 +4026,26 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40264026
OrganizationID: j.OrganizationID,
40274027
Types: []database.ProvisionerType{j.Provisioner},
40284028
ProvisionerTags: must(json.Marshal(j.Tags)),
4029-
}).Asserts( /* rbac.ResourceProvisionerJobs, policy.ActionUpdate */ )
4029+
}).Asserts(rbac.ResourceProvisionerJobs, policy.ActionUpdate)
40304030
}))
40314031
s.Run("UpdateProvisionerJobWithCompleteByID", s.Subtest(func(db database.Store, check *expects) {
40324032
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40334033
check.Args(database.UpdateProvisionerJobWithCompleteByIDParams{
40344034
ID: j.ID,
4035-
}).Asserts( /* rbac.ResourceProvisionerJobs, policy.ActionUpdate */ )
4035+
}).Asserts(rbac.ResourceProvisionerJobs, policy.ActionUpdate)
40364036
}))
40374037
s.Run("UpdateProvisionerJobWithCompleteWithStartedAtByID", s.Subtest(func(db database.Store, check *expects) {
40384038
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40394039
check.Args(database.UpdateProvisionerJobWithCompleteWithStartedAtByIDParams{
40404040
ID: j.ID,
4041-
}).Asserts( /* rbac.ResourceProvisionerJobs, policy.ActionUpdate */ )
4041+
}).Asserts(rbac.ResourceProvisionerJobs, policy.ActionUpdate)
40424042
}))
40434043
s.Run("UpdateProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
40444044
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40454045
check.Args(database.UpdateProvisionerJobByIDParams{
40464046
ID: j.ID,
40474047
UpdatedAt: time.Now(),
4048-
}).Asserts( /* rbac.ResourceProvisionerJobs, policy.ActionUpdate */ )
4048+
}).Asserts(rbac.ResourceProvisionerJobs, policy.ActionUpdate)
40494049
}))
40504050
s.Run("InsertProvisionerJob", s.Subtest(func(db database.Store, check *expects) {
40514051
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4067,7 +4067,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40674067
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40684068
check.Args(database.InsertProvisionerJobTimingsParams{
40694069
JobID: j.ID,
4070-
}).Asserts( /* rbac.ResourceProvisionerJobs, policy.ActionUpdate */ )
4070+
}).Asserts(rbac.ResourceProvisionerJobs, policy.ActionUpdate)
40714071
}))
40724072
s.Run("UpsertProvisionerDaemon", s.Subtest(func(db database.Store, check *expects) {
40734073
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)

0 commit comments

Comments
 (0)