8000 refactor: Rename SQL query · coder/coder@18ad931 · GitHub
[go: up one dir, main page]
Skip to content

Commit 18ad931

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: Rename SQL query
1 parent f870d7e commit 18ad931

File tree

8 files changed

+99
-93
lines changed

8 files changed

+99
-93
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,6 +1165,13 @@ func (q *querier) CleanTailnetTunnels(ctx context.Context) error {
11651165
return q.db.CleanTailnetTunnels(ctx)
11661166
}
11671167

1168+
func (q *querier) CountInProgressPrebuilds(ctx context.Context) ([]database.CountInProgressPrebuildsRow, error) {
1169+
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTemplate); err != nil {
1170+
return nil, err
1171+
}
1172+
return q.db.CountInProgressPrebuilds(ctx)
1173+
}
1174+
11681175
func (q *querier) CountUnreadInboxNotificationsByUserID(ctx context.Context, userID uuid.UUID) (int64, error) {
11691176
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceInboxNotification.WithOwner(userID.String())); err != nil {
11701177
return 0, err
@@ -2094,13 +2101,6 @@ func (q *querier) GetPrebuildMetrics(ctx context.Context) ([]database.GetPrebuil
20942101
return q.db.GetPrebuildMetrics(ctx)
20952102
}
20962103

2097-
func (q *querier) GetPrebuildsInProgress(ctx context.Context) ([]database.GetPrebuildsInProgressRow, error) {
2098-
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTemplate); err != nil {
2099-
return nil, err
2100-
}
2101-
return q.db.GetPrebuildsInProgress(ctx)
2102-
}
2103-
21042104
func (q *querier) GetPresetByWorkspaceBuildID(ctx context.Context, workspaceID uuid.UUID) (database.TemplateVersionPreset, error) {
21052105
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceTemplate); err != nil {
21062106
return database.TemplateVersionPreset{}, err

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@ func (s *MethodTestSuite) TestUser() {
17481748
check.Args(database.DeleteCustomRoleParams{
17491749
Name: customRole.Name,
17501750
}).Asserts(
1751-
// fails immediately, missing organization id
1751+
// fails immediately, missing organization id
17521752
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
17531753
}))
17541754
s.Run("Blank/UpdateCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -1779,7 +1779,7 @@ func (s *MethodTestSuite) TestUser() {
17791779
codersdk.ResourceWorkspace: {codersdk.ActionRead},
17801780
}), convertSDKPerm),
17811781
}).Asserts(
1782-
// fails immediately, missing organization id
1782+
// fails immediately, missing organization id
17831783
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
17841784
}))
17851785
s.Run("OrgPermissions/UpdateCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -1832,7 +1832,7 @@ func (s *MethodTestSuite) TestUser() {
18321832
codersdk.ResourceWorkspace: {codersdk.ActionRead},
18331833
}), convertSDKPerm),
18341834
}).Asserts(
1835-
// fails immediately, missing organization id
1835+
// fails immediately, missing organization id
18361836
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
18371837
}))
18381838
s.Run("OrgPermissions/InsertCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -3843,7 +3843,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
38433843
s.Run("GetProvisionerJobsCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
38443844
// TODO: add provisioner job resource type
38453845
_ = dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{CreatedAt: time.Now().Add(-time.Hour)})
3846-
check.Args(time.Now()).Asserts 6D4E ( /*rbac.ResourceSystem, policy.ActionRead*/ )
3846+
check.Args(time.Now()).Asserts( /*rbac.ResourceSystem, policy.ActionRead*/)
38473847
}))
38483848
s.Run("GetTemplateVersionsByIDs", s.Subtest(func(db database.Store, check *expects) {
38493849
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4020,7 +4020,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40204020
a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40214021
b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40224022
check.Args([]uuid.UUID{a.ID, b.ID}).
4023-
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/ ).
4023+
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/).
40244024
Returns(slice.New(a, b))
40254025
}))
40264026
s.Run("InsertWorkspaceAgent", s.Subtest(func(db database.Store, check *expects) {
@@ -4065,22 +4065,22 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40654065
OrganizationID: j.OrganizationID,
40664066
Types: []database.ProvisionerType{j.Provisioner},
40674067
ProvisionerTags: must(json.Marshal(j.Tags)),
4068-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
4068+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
40694069
}))
40704070
s.Run("UpdateProvisionerJobWithCompleteByID", s.Subtest(func(db database.Store, check *expects) {
40714071
// TODO: we need to create a ProvisionerJob resource
40724072
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40734073
check.Args(database.UpdateProvisionerJobWithCompleteByIDParams{
40744074
ID: j.ID,
4075-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
4075+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
40764076
}))
40774077
s.Run("UpdateProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
40784078
// TODO: we need to create a ProvisionerJob resource
40794079
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40804080
check.Args(database.UpdateProvisionerJobByIDParams{
40814081
ID: j.ID,
40824082
UpdatedAt: time.Now(),
4083-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
4083+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
40844084
}))
40854085
s.Run("InsertProvisionerJob", s.Subtest(func(db database.Store, check *expects) {
40864086
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4091,21 +4091,21 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40914091
StorageMethod: database.ProvisionerStorageMethodFile,
40924092
Type: database.ProvisionerJobTypeWorkspaceBuild,
40934093
Input: json.RawMessage("{}"),
4094-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
4094+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
40954095
}))
40964096
s.Run("InsertProvisionerJobLogs", s.Subtest(func(db database.Store, check *expects) {
40974097
// TODO: we need to create a ProvisionerJob resource
40984098
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40994099
check.Args(database.InsertProvisionerJobLogsParams{
41004100
JobID: j.ID,
4101-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
4101+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
41024102
}))
41034103
s.Run("InsertProvisionerJobTimings", s.Subtest(func(db database.Store, check *expects) {
41044104
// TODO: we need to create a ProvisionerJob resource
41054105
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
41064106
check.Args(database.InsertProvisionerJobTimingsParams{
41074107
JobID: j.ID,
4108-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
4108+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
41094109
}))
41104110
s.Run("UpsertProvisionerDaemon", s.Subtest(func(db database.Store, check *expects) {
41114111
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4762,7 +4762,7 @@ func (s *MethodTestSuite) TestPrebuilds() {
47624762
Asserts(rbac.ResourceTemplate, policy.ActionRead).
47634763
ErrorsWithInMemDB(dbmem.ErrUnimplemented)
47644764
}))
4765-
s.Run("GetPrebuildsInProgress", s.Subtest(func(_ database.Store, check *expects) {
4765+
s.Run("CountInProgressPrebuilds", s.Subtest(func(_ database.Store, check *expects) {
47664766
check.Args().
47674767
Asserts(rbac.ResourceTemplate, policy.ActionRead).
47684768
ErrorsWithInMemDB(dbmem.ErrUnimplemented)

‎coderd/database/dbmem/dbmem.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,6 +1753,10 @@ func (*FakeQuerier) CleanTailnetTunnels(context.Context) error {
17531753
return ErrUnimplemented
17541754
}
17551755

1756+
func (q *FakeQuerier) CountInProgressPrebuilds(ctx context.Context) ([]database.CountInProgressPrebuildsRow, error) {
1757+
return nil, ErrUnimplemented
1758+
}
1759+
17561760
func (q *FakeQuerier) CountUnreadInboxNotificationsByUserID(_ context.Context, userID uuid.UUID) (int64, error) {
17571761
q.mutex.RLock()
17581762
defer q.mutex.RUnlock()
@@ -4124,10 +4128,6 @@ func (*FakeQuerier) GetPrebuildMetrics(_ context.Context) ([]database.GetPrebuil
41244128
return nil, ErrUnimplemented
41254129
}
41264130

4127-
func (*FakeQuerier) GetPrebuildsInProgress(_ context.Context) ([]database.GetPrebuildsInProgressRow, error) {
4128-
return nil, ErrUnimplemented
4129-
}
4130-
41314131
func (q *FakeQuerier) GetPresetByWorkspaceBuildID(_ context.Context, workspaceBuildID uuid.UUID) (database.TemplateVersionPreset, error) {
41324132
q.mutex.RLock()
41334133
defer q.mutex.RUnlock()

‎coderd/database/dbmetrics/querymetrics.go

Lines changed: 7 additions & 7 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: 15 additions & 15 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: 3 additions & 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: 46 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/prebuilds.sql

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ FROM workspace_prebuilds p
3434
WHERE (b.transition = 'start'::workspace_transition
3535
AND b.job_status = 'succeeded'::provisioner_job_status);
3636

37-
-- name: GetPrebuildsInProgress :many
37+
-- name: CountInProgressPrebuilds :many
38+
-- CountInProgressPrebuilds returns the number of in-progress prebuilds, grouped by template version ID and transition.
39+
-- Prebuild considered in-progress if it's in the "starting", "stopping", or "deleting" state.
38< 6C96 /code>40
SELECT t.id AS template_id, wpb.template_version_id, wpb.transition, COUNT(wpb.transition)::int AS count
3941
FROM workspace_latest_builds wlb
40-
INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id
41-
INNER JOIN templates t ON t.active_version_id = wlb.template_version_id
42+
INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id
43+
INNER JOIN templates t ON t.active_version_id = wlb.template_version_id
4244
WHERE wlb.job_status IN ('pending'::provisioner_job_status, 'running'::provisioner_job_status)
4345
GROUP BY t.id, wpb.template_version_id, wpb.transition;
4446

0 commit comments

Comments
 (0)
0