Skip to content

chore(coderd/database/dbauthz): migrate File, Group, APIKey, AuditLogs, and ConnectionLogs tests to mocked db #19299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+237 −343
Open

chore(coderd/database/dbauthz): migrate File, Group, APIKey, AuditLogs, and ConnectionLogs tests to mocked db #19299

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11c13cd
test(dbauthz): migrate TestFile tests to mocked db\n\n- Use s.Mocked …
blink-so[bot] Aug 9, 2025
aaa4d25
test(dbauthz): migrate TestGroup to mocked db\n\n- Switch TestGroup s…
blink-so[bot] Aug 9, 2025
ecacf71
test(dbauthz): migrate TestAPIKey to mocked db\n\n- Convert remaining…
blink-so[bot] Aug 9, 2025
7465e88
test(dbauthz): migrate TestAuditLogs to mocked db\n\n- Convert audit …
blink-so[bot] Aug 9, 2025
1ff8f54
test(dbauthz): migrate TestConnectionLogs to mocked db\n\n- Convert c…
blink-so[bot] Aug 9, 2025
213fc59
use object directly
Emyrk Aug 12, 2025
c514e88
return same group
Emyrk Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
test(dbauthz): migrate TestFile tests to mocked db\n\n- Use s.Mocked … 
…with dbmock and gofakeit\n- Add expectations for GetFileByHashAndCreator, GetFileByID, GetFileIDByTemplateVersionID, InsertFile\n- Seed data with testutil.Fake\n\nRefs: coder/internal#869\nCo-authored-by: hugodutka <28019628+hugodutka@users.noreply.github.com>
  • Loading branch information
@blink-so
blink-so[bot] committed Aug 9, 2025
commit 11c13cdba8ad85f5ce6de64f7e4569405f8c5937
32 changes: 18 additions & 14 deletions coderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,28 +448,32 @@ func (s *MethodTestSuite) TestConnectionLogs() {
}

func (s *MethodTestSuite) TestFile() {
s.Run("GetFileByHashAndCreator", s.Subtest(func(db database.Store, check *expects) {
f := dbgen.File(s.T(), db, database.File{})
s.Run("GetFileByHashAndCreator", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
f := testutil.Fake(s.T(), faker, database.File{})
dbm.EXPECT().GetFileByHashAndCreator(gomock.Any(), gomock.Any()).Return(f, nil).AnyTimes()
// dbauthz may attempt to check template access on NotAuthorized; ensure mock handles it.
dbm.EXPECT().GetFileTemplates(gomock.Any(), f.ID).Return([]database.GetFileTemplatesRow{}, nil).AnyTimes()
check.Args(database.GetFileByHashAndCreatorParams{
Hash: f.Hash,
CreatedBy: f.CreatedBy,
}).Asserts(f, policy.ActionRead).Returns(f)
}))
s.Run("GetFileByID", s.Subtest(func(db database.Store, check *expects) {
f := dbgen.File(s.T(), db, database.File{})
s.Run("GetFileByID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
f := testutil.Fake(s.T(), faker, database.File{})
dbm.EXPECT().GetFileByID(gomock.Any(), f.ID).Return(f, nil).AnyTimes()
dbm.EXPECT().GetFileTemplates(gomock.Any(), f.ID).Return([]database.GetFileTemplatesRow{}, nil).AnyTimes()
check.Args(f.ID).Asserts(f, policy.ActionRead).Returns(f)
}))
s.Run("GetFileIDByTemplateVersionID", s.Subtest(func(db database.Store, check *expects) {
o := dbgen.Organization(s.T(), db, database.Organization{})
u := dbgen.User(s.T(), db, database.User{})
_ = dbgen.OrganizationMember(s.T(), db, database.OrganizationMember{OrganizationID: o.ID, UserID: u.ID})
f := dbgen.File(s.T(), db, database.File{CreatedBy: u.ID})
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{StorageMethod: database.ProvisionerStorageMethodFile, FileID: f.ID})
tv := dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{OrganizationID: o.ID, JobID: j.ID, CreatedBy: u.ID})
check.Args(tv.ID).Asserts(rbac.ResourceFile.WithID(f.ID), policy.ActionRead).Returns(f.ID)
s.Run("GetFileIDByTemplateVersionID", s.Mocked(func(dbm *dbmock.MockStore, _ *gofakeit.Faker, check *expects) {
tvID := uuid.New()
fileID := uuid.New()
dbm.EXPECT().GetFileIDByTemplateVersionID(gomock.Any(), tvID).Return(fileID, nil).AnyTimes()
check.Args(tvID).Asserts(rbac.ResourceFile.WithID(fileID), policy.ActionRead).Returns(fileID)
}))
s.Run("InsertFile", s.Subtest(func(db database.Store, check *expects) {
u := dbgen.User(s.T(), db, database.User{})
s.Run("InsertFile", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
u := testutil.Fake(s.T(), faker, database.User{})
ret := testutil.Fake(s.T(), faker, database.File{CreatedBy: u.ID})
dbm.EXPECT().InsertFile(gomock.Any(), gomock.Any()).Return(ret, nil).AnyTimes()
check.Args(database.InsertFileParams{
CreatedBy: u.ID,
}).Asserts(rbac.ResourceFile.WithOwner(u.ID.String()), policy.ActionCreate)
Expand Down
Loading