Skip to content

Commit 9dccf3e

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: make gen + reorder methods
1 parent c6f209c commit 9dccf3e

File tree

2 files changed

+72
-72
lines changed

2 files changed

+72
-72
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,9 @@ func As(ctx context.Context, actor rbac.Subject) context.Context {
482482
// running the insertFunc. The insertFunc is expected to return the object that
483483
// was inserted.
484484
func insert[
485-
ObjectType any,
486-
ArgumentType any,
487-
Insert func(ctx context.Context, arg ArgumentType) (ObjectType, error),
485+
ObjectType any,
486+
ArgumentType any,
487+
Insert func(ctx context.Context, arg ArgumentType) (ObjectType, error),
488488
](
489489
logger slog.Logger,
490490
authorizer rbac.Authorizer,
@@ -495,9 +495,9 @@ func insert[
495495
}
496496

497497
func insertWithAction[
498-
ObjectType any,
499-
ArgumentType any,
500-
Insert func(ctx context.Context, arg ArgumentType) (ObjectType, error),
498+
ObjectType any,
499+
ArgumentType any,
500+
Insert func(ctx context.Context, arg ArgumentType) (ObjectType, error),
501501
](
502502
logger slog.Logger,
503503
authorizer rbac.Authorizer,
@@ -524,10 +524,10 @@ func insertWithAction[
524524
}
525525

526526
func deleteQ[
527-
ObjectType rbac.Objecter,
528-
ArgumentType any,
529-
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
530-
Delete func(ctx context.Context, arg ArgumentType) error,
527+
ObjectType rbac.Objecter,
528+
ArgumentType any,
529+
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
530+
Delete func(ctx context.Context, arg ArgumentType) error,
531531
](
532532
logger slog.Logger,
533533
authorizer rbac.Authorizer,
@@ -539,10 +539,10 @@ func deleteQ[
539539
}
540540

541541
func updateWithReturn[
542-
ObjectType rbac.Objecter,
543-
ArgumentType any,
544-
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
545-
UpdateQuery func(ctx context.Context, arg ArgumentType) (ObjectType, error),
542+
ObjectType rbac.Objecter,
543+
ArgumentType any,
544+
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
545+
UpdateQuery func(ctx context.Context, arg ArgumentType) (ObjectType, error),
546546
](
547547
logger slog.Logger,
548548
authorizer rbac.Authorizer,
@@ -553,10 +553,10 @@ func updateWithReturn[
553553
}
554554

555555
func update[
556-
ObjectType rbac.Objecter,
557-
ArgumentType any,
558-
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
559-
Exec func(ctx context.Context, arg ArgumentType) error,
556+
ObjectType rbac.Objecter,
557+
ArgumentType any,
558+
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
559+
Exec func(ctx context.Context, arg ArgumentType) error,
560560
](
561561
logger slog.Logger,
562562
authorizer rbac.Authorizer,
@@ -574,9 +574,9 @@ func update[
574574
// user cannot read the resource. This is because the resource details are
575575
// required to run a proper authorization check.
576576
func fetchWithAction[
577-
ArgumentType any,
578-
ObjectType rbac.Objecter,
579-
DatabaseFunc func(ctx context.Context, arg ArgumentType) (ObjectType, error),
577+
ArgumentType any,
578+
ObjectType rbac.Objecter,
579+
DatabaseFunc func(ctx context.Context, arg ArgumentType) (ObjectType, error),
580580
](
581581
logger slog.Logger,
582582
authorizer rbac.Authorizer,
@@ -607,9 +607,9 @@ func fetchWithAction[
607607
}
608608

609609
func fetch[
610-
ArgumentType any,
611-
ObjectType rbac.Objecter,
612-
DatabaseFunc func(ctx context.Context, arg ArgumentType) (ObjectType, error),
610+
ArgumentType any,
611+
ObjectType rbac.Objecter,
612+
DatabaseFunc func(ctx context.Context, arg ArgumentType) (ObjectType, error),
613613
](
614614
logger slog.Logger,
615615
authorizer rbac.Authorizer,
@@ -622,10 +622,10 @@ func fetch[
622622
// from SQL 'exec' functions which only return an error.
623623
// See fetchAndQuery for more information.
624624
func fetchAndExec[
625-
ObjectType rbac.Objecter,
626-
ArgumentType any,
627-
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
628-
Exec func(ctx context.Context, arg ArgumentType) error,
625+
ObjectType rbac.Objecter,
626+
ArgumentType any,
627+
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
628+
Exec func(ctx context.Context, arg ArgumentType) error,
629629
](
630630
logger slog.Logger,
631631
authorizer rbac.Authorizer,
@@ -648,10 +648,10 @@ func fetchAndExec[
648648
// **before** the query runs. The returns from the fetch are only used to
649649
// assert rbac. The final return of this function comes from the Query function.
650650
func fetchAndQuery[
651-
ObjectType rbac.Objecter,
652-
ArgumentType any,
653-
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
654-
Query func(ctx context.Context, arg ArgumentType) (ObjectType, error),
651+
ObjectType rbac.Objecter,
652+
ArgumentType any,
653+
Fetch func(ctx context.Context, arg ArgumentType) (ObjectType, error),
654+
Query func(ctx context.Context, arg ArgumentType) (ObjectType, error),
655655
](
656656
logger slog.Logger,
657657
authorizer rbac.Authorizer,
@@ -685,9 +685,9 @@ func fetchAndQuery[
685685
// fetchWithPostFilter is like fetch, but works with lists of objects.
686686
// SQL filters are much more optimal.
687687
func fetchWithPostFilter[
688-
ArgumentType any,
689-
ObjectType rbac.Objecter,
690-
DatabaseFunc func(ctx context.Context, arg ArgumentType) ([]ObjectType, error),
688+
ArgumentType any,
689+
ObjectType rbac.Objecter,
690+
DatabaseFunc func(ctx context.Context, arg ArgumentType) ([]ObjectType, error),
691691
](
692692
authorizer rbac.Authorizer,
693693
action policy.Action,
@@ -1074,24 +1074,6 @@ func (q *querier) customRoleCheck(ctx context.Context, role database.CustomRole)
10741074
return nil
10751075
}
10761076

1077-
func (q *querier) UpdatePresetPrebuildStatus(ctx context.Context, arg database.UpdatePresetPrebuildStatusParams) error {
1078-
preset, err := q.db.GetPresetByID(ctx, arg.PresetID)
1079-
if err != nil {
1080-
return err
1081-
}
1082-
1083-
object := rbac.ResourceTemplate.
1084-
WithID(preset.TemplateID.UUID).
1085-
InOrg(preset.OrganizationID)
1086-
1087-
err = q.authorizeContext(ctx, policy.ActionUpdate, object)
1088-
if err != nil {
1089-
return err
1090-
}
1091-
1092-
return q.db.UpdatePresetPrebuildStatus(ctx, arg)
1093-
}
1094-
10951077
func (q *querier) AcquireLock(ctx context.Context, id int64) error {
10961078
return q.db.AcquireLock(ctx, id)
10971079
}
@@ -4196,6 +4178,24 @@ func (q *querier) UpdateOrganizationDeletedByID(ctx context.Context, arg databas
41964178
return deleteQ(q.log, q.auth, q.db.GetOrganizationByID, deleteF)(ctx, arg.ID)
41974179
}
41984180

4181+
func (q *querier) UpdatePresetPrebuildStatus(ctx context.Context, arg database.UpdatePresetPrebuildStatusParams) error {
4182+
preset, err := q.db.GetPresetByID(ctx, arg.PresetID)
4183+
if err != nil {
4184+
return err
4185+
}
4186+
4187+
object := rbac.ResourceTemplate.
4188+
WithID(preset.TemplateID.UUID).
4189+
InOrg(preset.OrganizationID)
4190+
4191+
err = q.authorizeContext(ctx, policy.ActionUpdate, object)
4192+
if err != nil {
4193+
return err
4194+
}
4195+
4196+
return q.db.UpdatePresetPrebuildStatus(ctx, arg)
4197+
}
4198+
41994199
func (q *querier) UpdateProvisionerDaemonLastSeenAt(ctx context.Context, arg database.UpdateProvisionerDaemonLastSeenAtParams) error {
42004200
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerDaemon); err != nil {
42014201
return err

‎coderd/database/dbmem/dbmem.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,25 +1386,6 @@ func isDeprecated(template database.Template) bool {
13861386
return template.Deprecated != ""
13871387
}
13881388

1389-
func (q *FakeQuerier) UpdatePresetPrebuildStatus(ctx context.Context, arg database.UpdatePresetPrebuildStatusParams) error {
1390-
err := validateDatabaseType(arg)
1391-
if err != nil {
1392-
return err
1393-
}
1394-
1395-
q.mutex.RLock()
1396-
defer q.mutex.RUnlock()
1397-
1398-
for _, preset := range q.presets {
1399-
if preset.ID == arg.PresetID {
1400-
preset.PrebuildStatus = arg.Status
1401-
return nil
1402-
}
1403-
}
1404-
1405-
return xerrors.Errorf("preset %v does not exist", arg.PresetID)
1406-
}
1407-
14081389
func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
14091390
return xerrors.New("AcquireLock must only be called within a transaction")
14101391
}
@@ -10897,6 +10878,25 @@ func (q *FakeQuerier) UpdateOrganizationDeletedByID(_ context.Context, arg datab
1089710878
return sql.ErrNoRows
1089810879
}
1089910880

10881+
func (q *FakeQuerier) UpdatePresetPrebuildStatus(ctx context.Context, arg database.UpdatePresetPrebuildStatusParams) error {
10882+
err := validateDatabaseType(arg)
10883+
if err != nil {
10884+
return err
10885+
}
10886+
10887+
q.mutex.RLock()
10888+
defer q.mutex.RUnlock()
10889+
10890+
for _, preset := range q.presets {
10891+
if preset.ID == arg.PresetID {
10892+
preset.PrebuildStatus = arg.Status
10893+
return nil
10894+
}
10895+
}
10896+
10897+
return xerrors.Errorf("preset %v does not exist", arg.PresetID)
10898+
}
10899+
1090010900
func (q *FakeQuerier) UpdateProvisionerDaemonLastSeenAt(_ context.Context, arg database.UpdateProvisionerDaemonLastSeenAtParams) error {
1090110901
err := validateDatabaseType(arg)
1090210902
if err != nil {

0 commit comments

Comments
 (0)