Skip to content

Commit a0fb69c

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: rename DB method
1 parent a793e18 commit a0fb69c

File tree

9 files changed

+90
-90
lines changed

9 files changed

+90
-90
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,6 +1074,24 @@ 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+
10771095
func (q *querier) AcquireLock(ctx context.Context, id int64) error {
10781096
return q.db.AcquireLock(ctx, id)
10791097
}
@@ -4178,24 +4196,6 @@ func (q *querier) UpdateOrganizationDeletedByID(ctx context.Context, arg databas
41784196
return deleteQ(q.log, q.auth, q.db.GetOrganizationByID, deleteF)(ctx, arg.ID)
41794197
}
41804198

4181-
func (q *querier) UpdatePrebuildStatus(ctx context.Context, arg database.UpdatePrebuildStatusParams) 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.UpdatePrebuildStatus(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/dbauthz/dbauthz_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4945,7 +4945,7 @@ func (s *MethodTestSuite) TestPrebuilds() {
49454945
PrebuildStatus: database.PrebuildStatusHealthy,
49464946
})
49474947
}))
4948-
s.Run("UpdatePrebuildStatus", s.Subtest(func(db database.Store, check *expects) {
4948+
s.Run("UpdatePresetPrebuildStatus", s.Subtest(func(db database.Store, check *expects) {
49494949
org := dbgen.Organization(s.T(), db, database.Organization{})
49504950
user := dbgen.User(s.T(), db, database.User{})
49514951
template := dbgen.Template(s.T(), db, database.Template{
@@ -4963,7 +4963,7 @@ func (s *MethodTestSuite) TestPrebuilds() {
49634963
preset := dbgen.Preset(s.T(), db, database.InsertPresetParams{
49644964
TemplateVersionID: templateVersion.ID,
49654965
})
4966-
req := database.UpdatePrebuildStatusParams{
4966+
req := database.UpdatePresetPrebuildStatusParams{
49674967
PresetID: preset.ID,
49684968
Status: database.PrebuildStatusHealthy,
49694969
}

‎coderd/database/dbmem/dbmem.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,25 @@ 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+
13891408
func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
13901409
return xerrors.New("AcquireLock must only be called within a transaction")
13911410
}
@@ -10878,25 +10897,6 @@ func (q *FakeQuerier) UpdateOrganizationDeletedByID(_ context.Context, arg datab
1087810897
return sql.ErrNoRows
1087910898
}
1088010899

10881-
func (q *FakeQuerier) UpdatePrebuildStatus(ctx context.Context, arg database.UpdatePrebuildStatusParams) 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 {

‎coderd/database/dbmetrics/querymetrics.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/presets.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SELECT
2525
unnest(@values :: TEXT[])
2626
RETURNING *;
2727

28-
-- name: UpdatePrebuildStatus :exec
28+
-- name: UpdatePresetPrebuildStatus :exec
2929
UPDATE template_version_presets
3030
SET prebuild_status = @status
3131
WHERE id = @preset_id;

‎enterprise/coderd/prebuilds/reconcile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ func (c *StoreReconciler) ReconcilePreset(ctx context.Context, ps prebuilds.Pres
373373
if ps.IsHardLimited {
374374
logger.Warn(ctx, "skipping hard limited preset", slog.F("preset_id", ps.Preset.ID), slog.F("name", ps.Preset.Name))
375375

376-
err := c.store.UpdatePrebuildStatus(ctx, database.UpdatePrebuildStatusParams{
376+
err := c.store.UpdatePresetPrebuildStatus(ctx, database.UpdatePresetPrebuildStatusParams{
377377
Status: database.PrebuildStatusHardLimited,
378378
PresetID: ps.Preset.ID,
379379
})

0 commit comments

Comments
 (0)