Skip to content

Commit 1c7bfc8

Browse files
sreyasreya
committed
refactor: replace keys with crypto_keys handling
1 parent 6f4a504 commit 1c7bfc8

16 files changed

+605
-239
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,10 @@ func (q *querier) DeleteCoordinator(ctx context.Context, id uuid.UUID) error {
10411041
return q.db.DeleteCoordinator(ctx, id)
10421042
}
10431043

1044+
func (q *querier) DeleteCryptoKey(ctx context.Context, arg database.DeleteCryptoKeyParams) (database.CryptoKey, error) {
1045+
panic("not implemented")
1046+
}
1047+
10441048
func (q *querier) DeleteCustomRole(ctx context.Context, arg database.DeleteCustomRoleParams) error {
10451049
if arg.OrganizationID.UUID != uuid.Nil {
10461050
if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceAssignOrgRole.InOrg(arg.OrganizationID.UUID)); err != nil {
@@ -1078,10 +1082,6 @@ func (q *querier) DeleteGroupMemberFromGroup(ctx context.Context, arg database.D
10781082
return update(q.log, q.auth, fetch, q.db.DeleteGroupMemberFromGroup)(ctx, arg)
10791083
}
10801084

1081-
func (q *querier) DeleteKey(ctx context.Context, arg database.DeleteKeyParams) error {
1082-
panic("not implemented")
1083-
}
1084-
10851085
func (q *querier) DeleteLicense(ctx context.Context, id int32) (int32, error) {
10861086
err := deleteQ(q.log, q.auth, q.db.GetLicenseByID, func(ctx context.Context, id int32) error {
10871087
_, err := q.db.DeleteLicense(ctx, id)
@@ -1387,6 +1387,14 @@ func (q *querier) GetCoordinatorResumeTokenSigningKey(ctx context.Context) (stri
13871387
return q.db.GetCoordinatorResumeTokenSigningKey(ctx)
13881388
}
13891389

1390+
func (q *querier) GetCryptoKeyByFeatureAndSequence(ctx context.Context, arg database.GetCryptoKeyByFeatureAndSequenceParams) (database.CryptoKey, error) {
1391+
panic("not implemented")
1392+
}
1393+
1394+
func (q *querier) GetCryptoKeys(ctx context.Context) ([]database.CryptoKey, error) {
1395+
panic("not implemented")
1396+
}
1397+
13901398
func (q *querier) GetDBCryptKeys(ctx context.Context) ([]database.DBCryptKey, error) {
13911399
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
13921400
return nil, err
@@ -1546,21 +1554,17 @@ func (q *querier) GetJFrogXrayScanByWorkspaceAndAgentID(ctx context.Context, arg
15461554
return q.db.GetJFrogXrayScanByWorkspaceAndAgentID(ctx, arg)
15471555
}
15481556

1549-
func (q *querier) GetKeyByFeatureAndSequence(ctx context.Context, arg database.GetKeyByFeatureAndSequenceParams) (database.Key, error) {
1550-
panic("not implemented")
1551-
}
1552-
1553-
func (q *querier) GetKeys(ctx context.Context) ([]database.Key, error) {
1554-
panic("not implemented")
1555-
}
1556-
15571557
func (q *querier) GetLastUpdateCheck(ctx context.Context) (string, error) {
15581558
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
15591559
return "", err
15601560
}
15611561
return q.db.GetLastUpdateCheck(ctx)
15621562
}
15631563

1564+
func (q *querier) GetLatestCryptoKeyByFeature(ctx context.Context, feature database.CryptoKeyFeature) (database.CryptoKey, error) {
1565+
panic("not implemented")
1566+
}
1567+
15641568
func (q *querier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) {
15651569
if _, err := q.GetWorkspaceByID(ctx, workspaceID); err != nil {
15661570
return database.WorkspaceBuild{}, err
@@ -2666,6 +2670,10 @@ func (q *querier) InsertAuditLog(ctx context.Context, arg database.InsertAuditLo
26662670
return insert(q.log, q.auth, rbac.ResourceAuditLog, q.db.InsertAuditLog)(ctx, arg)
26672671
}
26682672

2673+
func (q *querier) InsertCryptoKey(ctx context.Context, arg database.InsertCryptoKeyParams) (database.CryptoKey, error) {
2674+
panic("not implemented")
2675+
}
2676+
26692677
func (q *querier) InsertCustomRole(ctx context.Context, arg database.InsertCustomRoleParams) (database.CustomRole, error) {
26702678
// Org and site role upsert share the same query. So switch the assertion based on the org uuid.
26712679
if arg.OrganizationID.UUID != uuid.Nil {
@@ -2738,10 +2746,6 @@ func (q *querier) InsertGroupMember(ctx context.Context, arg database.InsertGrou
27382746
return update(q.log, q.auth, fetch, q.db.InsertGroupMember)(ctx, arg)
27392747
}
27402748

2741-
func (q *querier) InsertKey(ctx context.Context, arg database.InsertKeyParams) error {
2742-
panic("not implemented")
2743-
}
2744-
27452749
func (q *querier) InsertLicense(ctx context.Context, arg database.InsertLicenseParams) (database.License, error) {
27462750
if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceLicense); err != nil {
27472751
return database.License{}, err
@@ -3173,6 +3177,10 @@ func (q *querier) UpdateAPIKeyByID(ctx context.Context, arg database.UpdateAPIKe
31733177
return update(q.log, q.auth, fetch, q.db.UpdateAPIKeyByID)(ctx, arg)
31743178
}
31753179

3180+
func (q *querier) UpdateCryptoKeyDeletesAt(ctx context.Context, arg database.UpdateCryptoKeyDeletesAtParams) (database.CryptoKey, error) {
3181+
panic("not implemented")
3182+
}
3183+
31763184
func (q *querier) UpdateCustomRole(ctx context.Context, arg database.UpdateCustomRoleParams) (database.CustomRole, error) {
31773185
if arg.OrganizationID.UUID != uuid.Nil {
31783186
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceAssignOrgRole.InOrg(arg.OrganizationID.UUID)); err != nil {
@@ -3228,10 +3236,6 @@ func (q *querier) UpdateInactiveUsersToDormant(ctx context.Context, lastSeenAfte
32283236
return q.db.UpdateInactiveUsersToDormant(ctx, lastSeenAfter)
32293237
}
32303238

3231-
func (q *querier) UpdateKeyDeletesAt(ctx context.Context, arg database.UpdateKeyDeletesAtParams) error {
3232-
panic("not implemented")
3233-
}
3234-
32353239
func (q *querier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemberRolesParams) (database.OrganizationMember, error) {
32363240
// Authorized fetch will check that the actor has read access to the org member since the org member is returned.
32373241
member, err := database.ExpectOne(q.OrganizationMembers(ctx, database.OrganizationMembersParams{

‎coderd/database/dbmem/dbmem.go

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,15 @@ func (*FakeQuerier) DeleteCoordinator(context.Context, uuid.UUID) error {
14341434
return ErrUnimplemented
14351435
}
14361436

1437+
func (q *FakeQuerier) DeleteCryptoKey(ctx context.Context, arg database.DeleteCryptoKeyParams) (database.CryptoKey, error) {
1438+
err := validateDatabaseType(arg)
1439+
if err != nil {
1440+
return database.CryptoKey{}, err
1441+
}
1442+
1443+
panic("not implemented")
1444+
}
1445+
14371446
func (q *FakeQuerier) DeleteCustomRole(_ context.Context, arg database.DeleteCustomRoleParams) error {
14381447
err := validateDatabaseType(arg)
14391448
if err != nil {
@@ -1527,15 +1536,6 @@ func (q *FakeQuerier) DeleteGroupMemberFromGroup(_ context.Context, arg database
15271536
return nil
15281537
}
15291538

1530-
func (q *FakeQuerier) DeleteKey(ctx context.Context, arg database.DeleteKeyParams) error {
1531-
err := validateDatabaseType(arg)
1532-
if err != nil {
1533-
return err
1534-
}
1535-
1536-
panic("not implemented")
1537-
}
1538-
15391539
func (q *FakeQuerier) DeleteLicense(_ context.Context, id int32) (int32, error) {
15401540
q.mutex.Lock()
15411541
defer q.mutex.Unlock()
@@ -2318,6 +2318,19 @@ func (q *FakeQuerier) GetCoordinatorResumeTokenSigningKey(_ context.Context) (st
23182318
return q.coordinatorResumeTokenSigningKey, nil
23192319
}
23202320

2321+
func (q *FakeQuerier) GetCryptoKeyByFeatureAndSequence(ctx context.Context, arg database.GetCryptoKeyByFeatureAndSequenceParams) (database.CryptoKey, error) {
2322+
err := validateDatabaseType(arg)
2323+
if err != nil {
2324+
return database.CryptoKey{}, err
2325+
}
2326+
2327+
panic("not implemented")
2328+
}
2329+
2330+
func (q *FakeQuerier) GetCryptoKeys(ctx context.Context) ([]database.CryptoKey, error) {
2331+
panic("not implemented")
2332+
}
2333+
23212334
func (q *FakeQuerier) GetDBCryptKeys(_ context.Context) ([]database.DBCryptKey, error) {
23222335
q.mutex.RLock()
23232336
defer q.mutex.RUnlock()
@@ -2805,19 +2818,6 @@ func (q *FakeQuerier) GetJFrogXrayScanByWorkspaceAndAgentID(_ context.Context, a
28052818
return database.JfrogXrayScan{}, sql.ErrNoRows
28062819
}
28072820

2808-
func (q *FakeQuerier) GetKeyByFeatureAndSequence(ctx context.Context, arg database.GetKeyByFeatureAndSequenceParams) (database.Key, error) {
2809-
err := validateDatabaseType(arg)
2810-
if err != nil {
2811-
return database.Key{}, err
2812-
}
2813-
2814-
panic("not implemented")
2815-
}
2816-
2817-
func (q *FakeQuerier) GetKeys(ctx context.Context) ([]database.Key, error) {
2818-
panic("not implemented")
2819-
}
2820-
28212821
func (q *FakeQuerier) GetLastUpdateCheck(_ context.Context) (string, error) {
28222822
q.mutex.RLock()
28232823
defer q.mutex.RUnlock()
@@ -2828,6 +2828,10 @@ func (q *FakeQuerier) GetLastUpdateCheck(_ context.Context) (string, error) {
28282828
return string(q.lastUpdateCheck), nil
28292829
}
28302830

2831+
func (q *FakeQuerier) GetLatestCryptoKeyByFeature(ctx context.Context, feature database.CryptoKeyFeature) (database.CryptoKey, error) {
2832+
panic("not implemented")
2833+
}
2834+
28312835
func (q *FakeQuerier) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (database.WorkspaceBuild, error) {
28322836
q.mutex.RLock()
28332837
defer q.mutex.RUnlock()
@@ -6327,6 +6331,15 @@ func (q *FakeQuerier) InsertAuditLog(_ context.Context, arg database.InsertAudit
63276331
return alog, nil
63286332
}
63296333

6334+
func (q *FakeQuerier) InsertCryptoKey(ctx context.Context, arg database.InsertCryptoKeyParams) (database.CryptoKey, error) {
6335+
err := validateDatabaseType(arg)
6336+
if err != nil {
6337+
return database.CryptoKey{}, err
6338+
}
6339+
6340+
panic("not implemented")
6341+
}
6342+
63306343
func (q *FakeQuerier) InsertCustomRole(_ context.Context, arg database.InsertCustomRoleParams) (database.CustomRole, error) {
63316344
err := validateDatabaseType(arg)
63326345
if err != nil {
@@ -6514,15 +6527,6 @@ func (q *FakeQuerier) InsertGroupMember(_ context.Context, arg database.InsertGr
65146527
return nil
65156528
}
65166529

6517-
func (q *FakeQuerier) InsertKey(ctx context.Context, arg database.InsertKeyParams) error {
6518-
err := validateDatabaseType(arg)
6519-
if err != nil {
6520-
return err
6521-
}
6522-
6523-
panic("not implemented")
6524-
}
6525-
65266530
func (q *FakeQuerier) InsertLicense(
65276531
_ context.Context, arg database.InsertLicenseParams,
65286532
) (database.License, error) {
@@ -7805,6 +7809,15 @@ func (q *FakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPI
78057809
return sql.ErrNoRows
78067810
}
78077811

7812+
func (q *FakeQuerier) UpdateCryptoKeyDeletesAt(ctx context.Context, arg database.UpdateCryptoKeyDeletesAtParams) (database.CryptoKey, error) {
7813+
err := validateDatabaseType(arg)
7814+
if err != nil {
7815+
return database.CryptoKey{}, err
7816+
}
7817+
7818+
panic("not implemented")
7819+
}
7820+
78087821
func (q *FakeQuerier) UpdateCustomRole(_ context.Context, arg database.UpdateCustomRoleParams) (database.CustomRole, error) {
78097822
err := validateDatabaseType(arg)
78107823
if err != nil {
@@ -7921,15 +7934,6 @@ func (q *FakeQuerier) UpdateInactiveUsersToDormant(_ context.Context, params dat
79217934
return updated, nil
79227935
}
79237936

7924-
func (q *FakeQuerier) UpdateKeyDeletesAt(ctx context.Context, arg database.UpdateKeyDeletesAtParams) error {
7925-
err := validateDatabaseType(arg)
7926-
if err != nil {
7927-
return err
7928-
}
7929-
7930-
panic("not implemented")
7931-
}
7932-
79337937
func (q *FakeQuerier) UpdateMemberRoles(_ context.Context, arg database.UpdateMemberRolesParams) (database.OrganizationMember, error) {
79347938
if err := validateDatabaseType(arg); err != nil {
79357939
return database.OrganizationMember{}, err

‎coderd/database/dbmetrics/dbmetrics.go

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

0 commit comments

Comments
 (0)