synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename dbfake to dbmem (#10432)

Browse Source
This commit is contained in:
Kyle Carberry
2023-10-30 13:42:20 -04:00
committed by GitHub
parent 7a8da08124
commit 5abfe5afd0
42 changed files with 215 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coderd/database/dbauthz/dbauthz_test.go
View File

@ -16,8 +16,8 @@ import (
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbauthz"
"github.com/coder/coder/v2/coderd/database/dbfake"
"github.com/coder/coder/v2/coderd/database/dbgen"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/dbtime"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/util/slice"
@ -62,7 +62,7 @@ func TestAsNoActor(t *testing.T) {
func TestPing(t *testing.T) {
t.Parallel()
q := dbauthz.New(dbfake.New(), &coderdtest.RecordingAuthorizer{}, slog.Make(), accessControlStorePointer())
q := dbauthz.New(dbmem.New(), &coderdtest.RecordingAuthorizer{}, slog.Make(), accessControlStorePointer())
_, err := q.Ping(context.Background())
require.NoError(t, err, "must not error")
}
@ -71,7 +71,7 @@ func TestPing(t *testing.T) {
func TestInTX(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
q := dbauthz.New(db, &coderdtest.RecordingAuthorizer{
Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: xerrors.New("custom error")},
}, slog.Make(), accessControlStorePointer())
@ -99,7 +99,7 @@ func TestNew(t *testing.T) {
t.Parallel()
var (
db = dbfake.New()
db = dbmem.New()
exp = dbgen.Workspace(t, db, database.Workspace{})
rec = &coderdtest.RecordingAuthorizer{
Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
@ -126,7 +126,7 @@ func TestNew(t *testing.T) {
// as only the first db call will be made. But it is better than nothing.
func TestDBAuthzRecursive(t *testing.T) {
t.Parallel()
q := dbauthz.New(dbfake.New(), &coderdtest.RecordingAuthorizer{
q := dbauthz.New(dbmem.New(), &coderdtest.RecordingAuthorizer{
Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
}, slog.Make(), accessControlStorePointer())
actor := rbac.Subject{

4
coderd/database/dbauthz/setup_test.go
View File

@ -20,7 +20,7 @@ import (
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbauthz"
"github.com/coder/coder/v2/coderd/database/dbfake"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/dbmock"
"github.com/coder/coder/v2/coderd/rbac"
"github.com/coder/coder/v2/coderd/rbac/regosql"
@ -104,7 +104,7 @@ func (s *MethodTestSuite) Subtest(testCaseF func(db database.Store, check *expec
methodName := names[len(names)-1]
s.methodAccounting[methodName]++
db := dbfake.New()
db := dbmem.New()
fakeAuthorizer := &coderdtest.FakeAuthorizer{
AlwaysReturn: nil,
}

44
coderd/database/dbgen/dbgen_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbfake"
"github.com/coder/coder/v2/coderd/database/dbgen"
"github.com/coder/coder/v2/coderd/database/dbmem"
)
func TestGenerator(t *testing.T) {
@ -17,7 +17,7 @@ func TestGenerator(t *testing.T) {
t.Run("AuditLog", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
_ = dbgen.AuditLog(t, db, database.AuditLog{})
logs := must(db.GetAuditLogsOffset(context.Background(), database.GetAuditLogsOffsetParams{Limit: 1}))
require.Len(t, logs, 1)
@ -25,28 +25,28 @@ func TestGenerator(t *testing.T) {
t.Run("APIKey", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp, _ := dbgen.APIKey(t, db, database.APIKey{})
require.Equal(t, exp, must(db.GetAPIKeyByID(context.Background(), exp.ID)))
})
t.Run("File", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.File(t, db, database.File{})
require.Equal(t, exp, must(db.GetFileByID(context.Background(), exp.ID)))
})
t.Run("UserLink", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.UserLink(t, db, database.UserLink{})
require.Equal(t, exp, must(db.GetUserLinkByLinkedID(context.Background(), exp.LinkedID)))
})
t.Run("GitAuthLink", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.ExternalAuthLink(t, db, database.ExternalAuthLink{})
require.Equal(t, exp, must(db.GetExternalAuthLink(context.Background(), database.GetExternalAuthLinkParams{
ProviderID: exp.ProviderID,
@ -56,28 +56,28 @@ func TestGenerator(t *testing.T) {
t.Run("WorkspaceResource", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{})
require.Equal(t, exp, must(db.GetWorkspaceResourceByID(context.Background(), exp.ID)))
})
t.Run("WorkspaceApp", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.WorkspaceApp(t, db, database.WorkspaceApp{})
require.Equal(t, exp, must(db.GetWorkspaceAppsByAgentID(context.Background(), exp.AgentID))[0])
})
t.Run("WorkspaceResourceMetadata", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.WorkspaceResourceMetadatums(t, db, database.WorkspaceResourceMetadatum{})
require.Equal(t, exp, must(db.GetWorkspaceResourceMetadataByResourceIDs(context.Background(), []uuid.UUID{exp[0].WorkspaceResourceID})))
})
t.Run("WorkspaceProxy", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp, secret := dbgen.WorkspaceProxy(t, db, database.WorkspaceProxy{})
require.Len(t, secret, 64)
require.Equal(t, exp, must(db.GetWorkspaceProxyByID(context.Background(), exp.ID)))
@ -85,21 +85,21 @@ func TestGenerator(t *testing.T) {
t.Run("Job", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{})
require.Equal(t, exp, must(db.GetProvisionerJobByID(context.Background(), exp.ID)))
})
t.Run("Group", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.Group(t, db, database.Group{})
require.Equal(t, exp, must(db.GetGroupByID(context.Background(), exp.ID)))
})
t.Run("GroupMember", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
g := dbgen.Group(t, db, database.Group{})
u := dbgen.User(t, db, database.User{})
exp := []database.User{u}
@ -110,14 +110,14 @@ func TestGenerator(t *testing.T) {
t.Run("Organization", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.Organization(t, db, database.Organization{})
require.Equal(t, exp, must(db.GetOrganizationByID(context.Background(), exp.ID)))
})
t.Run("OrganizationMember", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.OrganizationMember(t, db, database.OrganizationMember{})
require.Equal(t, exp, must(db.GetOrganizationMemberByUserID(context.Background(), database.GetOrganizationMemberByUserIDParams{
OrganizationID: exp.OrganizationID,
@ -127,49 +127,49 @@ func TestGenerator(t *testing.T) {
t.Run("Workspace", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.Workspace(t, db, database.Workspace{})
require.Equal(t, exp, must(db.GetWorkspaceByID(context.Background(), exp.ID)))
})
t.Run("WorkspaceAgent", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{})
require.Equal(t, exp, must(db.GetWorkspaceAgentByID(context.Background(), exp.ID)))
})
t.Run("Template", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.Template(t, db, database.Template{})
require.Equal(t, exp, must(db.GetTemplateByID(context.Background(), exp.ID)))
})
t.Run("TemplateVersion", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.TemplateVersion(t, db, database.TemplateVersion{})
require.Equal(t, exp, must(db.GetTemplateVersionByID(context.Background(), exp.ID)))
})
t.Run("WorkspaceBuild", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{})
require.Equal(t, exp, must(db.GetWorkspaceBuildByID(context.Background(), exp.ID)))
})
t.Run("User", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.User(t, db, database.User{})
require.Equal(t, exp, must(db.GetUserByID(context.Background(), exp.ID)))
})
t.Run("SSHKey", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
exp := dbgen.GitSSHKey(t, db, database.GitSSHKey{})
require.Equal(t, exp, must(db.GetGitSSHKey(context.Background(), exp.UserID)))
})

6
coderd/database/dbfake/dbfake.go → coderd/database/dbmem/dbmem.go
View File

@ -1,4 +1,4 @@
package dbfake
package dbmem
import (
"context"
@ -705,7 +705,7 @@ func provisonerJobStatus(j database.ProvisionerJob) database.ProvisionerJobStatu
return database.ProvisionerJobStatusRunning
}
// isNull is only used in dbfake, so reflect is ok. Use this to make the logic
// isNull is only used in dbmem, so reflect is ok. Use this to make the logic
// look more similar to the postgres.
func isNull(v interface{}) bool {
return !isNotNull(v)
@ -4868,7 +4868,7 @@ func (q *FakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
return database.User{}, err
}
// There is a common bug when using dbfake that 2 inserted users have the
// There is a common bug when using dbmem that 2 inserted users have the
// same created_at time. This causes user order to not be deterministic,
// which breaks some unit tests.
// To fix this, we make sure that the created_at time is always greater

10
coderd/database/dbfake/dbfake_test.go → coderd/database/dbmem/dbmem_test.go
View File

@ -1,4 +1,4 @@
package dbfake_test
package dbmem_test
import (
"context"
@ -11,8 +11,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbfake"
"github.com/coder/coder/v2/coderd/database/dbgen"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/dbtime"
)
@ -20,7 +20,7 @@ import (
func TestInTx(t *testing.T) {
t.Parallel()
uut := dbfake.New()
uut := dbmem.New()
inTx := make(chan any)
queriesDone := make(chan any)
@ -67,7 +67,7 @@ func TestInTx(t *testing.T) {
func TestUserOrder(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
now := dbtime.Now()
usernames := []string{"b-user", "d-user", "a-user", "c-user", "e-user"}
@ -88,7 +88,7 @@ func TestUserOrder(t *testing.T) {
func TestProxyByHostname(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
// Insert a bunch of different proxies.
proxies := []struct {

4
coderd/database/dbpurge/dbpurge_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/coderd/database/dbfake"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/dbpurge"
)
@ -20,7 +20,7 @@ func TestMain(m *testing.M) {
// Ensures no goroutines leak.
func TestPurge(t *testing.T) {
t.Parallel()
purger := dbpurge.New(context.Background(), slogtest.Make(t, nil), dbfake.New())
purger := dbpurge.New(context.Background(), slogtest.Make(t, nil), dbmem.New())
err := purger.Close()
require.NoError(t, err)
}

4
coderd/database/dbtestutil/db.go
View File

@ -18,7 +18,7 @@ import (
"golang.org/x/xerrors"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbfake"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/postgres"
"github.com/coder/coder/v2/coderd/database/pubsub"
)
@ -79,7 +79,7 @@ func NewDB(t testing.TB, opts ...Option) (database.Store, pubsub.Pubsub) {
opt(&o)
}
db := dbfake.New()
db := dbmem.New()
ps := pubsub.NewInMemory()
if WillUsePostgres() {
connectionURL := os.Getenv("CODER_PG_CONNECTION_URL")