synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-15 22:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Rename databasefake --> dbfake (#6011)

Browse Source
This commit is contained in:
Steven Masley
2023-02-02 19:28:55 -06:00
committed by GitHub
parent f60f06e2c6
commit 8b424f03c2
29 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coderd/coderdtest/authorize.go
View File

@ -10,7 +10,7 @@ import (
"testing"
"time"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/go-chi/chi/v5"
"github.com/stretchr/testify/assert"
@ -30,7 +30,7 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {
// in memory fake. This is because the in memory fake does not use SQL, and
// still uses rego. So this boolean indicates how to assert the expected
// behavior.
_, isMemoryDB := a.api.Database.(databasefake.FakeDatabase)
_, isMemoryDB := a.api.Database.(dbfake.FakeDatabase)
// Some quick reused objects
workspaceRBACObj := rbac.ResourceWorkspace.WithID(a.Workspace.ID).InOrg(a.Organization.ID).WithOwner(a.Workspace.OwnerID.String())

2
coderd/database/databasefake/databasefake.go → coderd/database/dbfake/databasefake.go
View File

@ -1,4 +1,4 @@
package databasefake
package dbfake
import (
"context"

8
coderd/database/databasefake/databasefake_test.go → coderd/database/dbfake/databasefake_test.go
View File

@ -1,4 +1,4 @@
package databasefake_test
package dbfake_test
import (
"context"
@ -12,14 +12,14 @@ import (
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
)
// test that transactions don't deadlock, and that we don't see intermediate state.
func TestInTx(t *testing.T) {
t.Parallel()
uut := databasefake.New()
uut := dbfake.New()
inTx := make(chan any)
queriesDone := make(chan any)
@ -77,7 +77,7 @@ func TestExactMethods(t *testing.T) {
"IsFakeDB": "Helper function used for unit testing",
}
fake := reflect.TypeOf(databasefake.New())
fake := reflect.TypeOf(dbfake.New())
fakeMethods := methods(fake)
store := reflect.TypeOf((*database.Store)(nil)).Elem()

40
coderd/database/dbgen/generator_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
)
@ -17,7 +17,7 @@ func TestGenerator(t *testing.T) {
t.Run("AuditLog", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
_ = dbgen.AuditLog(t, db, database.AuditLog{})
logs := must(db.GetAuditLogsOffset(context.Background(), database.GetAuditLogsOffsetParams{Limit: 1}))
require.Len(t, logs, 1)
@ -25,56 +25,56 @@ func TestGenerator(t *testing.T) {
t.Run("APIKey", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.New()
exp := dbgen.UserLink(t, db, database.UserLink{})
require.Equal(t, exp, must(db.GetUserLinkByLinkedID(context.Background(), exp.LinkedID)))
})
t.Run("WorkspaceResource", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
exp := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{})
require.Equal(t, exp, must(db.GetWorkspaceResourceByID(context.Background(), exp.ID)))
})
t.Run("WorkspaceResourceMetadatum", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
exp := dbgen.WorkspaceResourceMetadatums(t, db, database.WorkspaceResourceMetadatum{})
require.Equal(t, exp, must(db.GetWorkspaceResourceMetadataByResourceIDs(context.Background(), []uuid.UUID{exp[0].WorkspaceResourceID})))
})
t.Run("Job", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
exp := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
require.Equal(t, exp, must(db.GetProvisionerJobByID(context.Background(), exp.ID)))
})
t.Run("Group", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.New()
g := dbgen.Group(t, db, database.Group{})
u := dbgen.User(t, db, database.User{})
exp := []database.User{u}
@ -85,14 +85,14 @@ func TestGenerator(t *testing.T) {
t.Run("Organization", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.New()
exp := dbgen.OrganizationMember(t, db, database.OrganizationMember{})
require.Equal(t, exp, must(db.GetOrganizationMemberByUserID(context.Background(), database.GetOrganizationMemberByUserIDParams{
OrganizationID: exp.OrganizationID,
@ -102,42 +102,42 @@ func TestGenerator(t *testing.T) {
t.Run("Workspace", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.New()
exp := dbgen.TemplateVersion(t, db, database.TemplateVersion{})
require.Equal(t, exp, must(db.GetTemplateVersionByID(context.Background(), exp.ID)))
})
t.Run("ParameterSchema", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
exp := dbgen.ParameterSchema(t, db, database.ParameterSchema{})
require.Equal(t, []database.ParameterSchema{exp}, must(db.GetParameterSchemasByJobID(context.Background(), exp.JobID)))
})
t.Run("ParameterValue", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
exp := dbgen.ParameterValue(t, db, database.ParameterValue{})
require.Equal(t, exp, must(db.GetParameterValueByScopeAndName(context.Background(), database.GetParameterValueByScopeAndNameParams{
Scope: exp.Scope,
@ -148,14 +148,14 @@ func TestGenerator(t *testing.T) {
t.Run("WorkspaceBuild", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.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 := databasefake.New()
db := dbfake.New()
exp := dbgen.User(t, db, database.User{})
require.Equal(t, exp, must(db.GetUserByID(context.Background(), exp.ID)))
})

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

@ -9,14 +9,14 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/postgres"
)
func NewDB(t *testing.T) (database.Store, database.Pubsub) {
t.Helper()
db := databasefake.New()
db := dbfake.New()
pubsub := database.NewPubsubInMemory()
if os.Getenv("DB") != "" {
connectionURL := os.Getenv("CODER_PG_CONNECTION_URL")

40
coderd/httpmw/apikey_test.go
View File

@ -16,7 +16,7 @@ import (
"golang.org/x/oauth2"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/coderd/httpapi"
"github.com/coder/coder/coderd/httpmw"
@ -43,7 +43,7 @@ func TestAPIKey(t *testing.T) {
t.Run("NoCookie", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
)
@ -59,7 +59,7 @@ func TestAPIKey(t *testing.T) {
t.Run("NoCookieRedirects", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
)
@ -78,7 +78,7 @@ func TestAPIKey(t *testing.T) {
t.Run("InvalidFormat", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
)
@ -96,7 +96,7 @@ func TestAPIKey(t *testing.T) {
t.Run("InvalidIDLength", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
)
@ -114,7 +114,7 @@ func TestAPIKey(t *testing.T) {
t.Run("InvalidSecretLength", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
)
@ -132,7 +132,7 @@ func TestAPIKey(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
id, secret = randomAPIKeyParts()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
@ -151,7 +151,7 @@ func TestAPIKey(t *testing.T) {
t.Run("InvalidSecret", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
user = dbgen.User(t, db, database.User{})
@ -176,7 +176,7 @@ func TestAPIKey(t *testing.T) {
t.Run("Expired", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
_, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -200,7 +200,7 @@ func TestAPIKey(t *testing.T) {
t.Run("Valid", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -235,7 +235,7 @@ func TestAPIKey(t *testing.T) {
t.Run("ValidWithScope", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
_, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -272,7 +272,7 @@ func TestAPIKey(t *testing.T) {
t.Run("QueryParameter", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
_, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -304,7 +304,7 @@ func TestAPIKey(t *testing.T) {
t.Run("ValidUpdateLastUsed", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -335,7 +335,7 @@ func TestAPIKey(t *testing.T) {
t.Run("ValidUpdateExpiry", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -366,7 +366,7 @@ func TestAPIKey(t *testing.T) {
t.Run("OAuthNotExpired", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -402,7 +402,7 @@ func TestAPIKey(t *testing.T) {
t.Run("OAuthRefresh", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -452,7 +452,7 @@ func TestAPIKey(t *testing.T) {
t.Run("RemoteIPUpdates", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,
@ -483,7 +483,7 @@ func TestAPIKey(t *testing.T) {
t.Run("RedirectToLogin", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
)
@ -504,7 +504,7 @@ func TestAPIKey(t *testing.T) {
t.Run("Optional", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
r = httptest.NewRequest("GET", "/", nil)
rw = httptest.NewRecorder()
@ -535,7 +535,7 @@ func TestAPIKey(t *testing.T) {
t.Run("Tokens", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
user = dbgen.User(t, db, database.User{})
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
UserID: user.ID,

6
coderd/httpmw/groupparam_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/coderd/httpmw"
)
@ -23,7 +23,7 @@ func TestGroupParam(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
group = dbgen.Group(t, db, database.Group{})
r = httptest.NewRequest("GET", "/", nil)
w = httptest.NewRecorder()
@ -52,7 +52,7 @@ func TestGroupParam(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
group = dbgen.Group(t, db, database.Group{})
r = httptest.NewRequest("GET", "/", nil)
w = httptest.NewRecorder()

12
coderd/httpmw/organizationparam_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/cryptorand"
@ -62,7 +62,7 @@ func TestOrganizationParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
rw = httptest.NewRecorder()
r, _ = setupAuthentication(db)
rtr = chi.NewRouter()
@ -84,7 +84,7 @@ func TestOrganizationParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
rw = httptest.NewRecorder()
r, _ = setupAuthentication(db)
rtr = chi.NewRouter()
@ -107,7 +107,7 @@ func TestOrganizationParam(t *testing.T) {
t.Run("InvalidUUID", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
rw = httptest.NewRecorder()
r, _ = setupAuthentication(db)
rtr = chi.NewRouter()
@ -130,7 +130,7 @@ func TestOrganizationParam(t *testing.T) {
t.Run("NotInOrganization", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
rw = httptest.NewRecorder()
r, u = setupAuthentication(db)
rtr = chi.NewRouter()
@ -163,7 +163,7 @@ func TestOrganizationParam(t *testing.T) {
t.Run("Success", func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
rw = httptest.NewRecorder()
r, user = setupAuthentication(db)
rtr = chi.NewRouter()

6
coderd/httpmw/ratelimit_test.go
View File

@ -13,7 +13,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/coderd/rbac"
@ -71,7 +71,7 @@ func TestRateLimit(t *testing.T) {
t.Run("RegularUser", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
u := dbgen.User(t, db, database.User{})
_, key := dbgen.APIKey(t, db, database.APIKey{UserID: u.ID})
@ -114,7 +114,7 @@ func TestRateLimit(t *testing.T) {
t.Run("OwnerBypass", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
u := dbgen.User(t, db, database.User{
RBACRoles: []string{rbac.RoleOwner()},

10
coderd/httpmw/templateparam_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/cryptorand"
@ -81,7 +81,7 @@ func TestTemplateParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractTemplateParam(db))
rtr.Get("/", nil)
@ -96,7 +96,7 @@ func TestTemplateParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractTemplateParam(db))
rtr.Get("/", nil)
@ -113,7 +113,7 @@ func TestTemplateParam(t *testing.T) {
t.Run("BadUUID", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractTemplateParam(db))
rtr.Get("/", nil)
@ -130,7 +130,7 @@ func TestTemplateParam(t *testing.T) {
t.Run("Template", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{

8
coderd/httpmw/templateversionparam_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/cryptorand"
@ -91,7 +91,7 @@ func TestTemplateVersionParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractTemplateVersionParam(db))
rtr.Get("/", nil)
@ -106,7 +106,7 @@ func TestTemplateVersionParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractTemplateVersionParam(db))
rtr.Get("/", nil)
@ -123,7 +123,7 @@ func TestTemplateVersionParam(t *testing.T) {
t.Run("TemplateVersion", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{

4
coderd/httpmw/userparam_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
)
@ -23,7 +23,7 @@ func TestUserParam(t *testing.T) {
t.Parallel()
setup := func(t *testing.T) (database.Store, *httptest.ResponseRecorder, *http.Request) {
var (
db = databasefake.New()
db = dbfake.New()
id, secret = randomAPIKeyParts()
hashed = sha256.Sum256([]byte(secret))
r = httptest.NewRequest("GET", "/", nil)

6
coderd/httpmw/workspaceagent_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
)
@ -28,7 +28,7 @@ func TestWorkspaceAgent(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractWorkspaceAgent(db),
@ -45,7 +45,7 @@ func TestWorkspaceAgent(t *testing.T) {
t.Run("Found", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractWorkspaceAgent(db),

8
coderd/httpmw/workspaceagentparam_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/cryptorand"
@ -103,7 +103,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
rtr.Get("/", nil)
@ -118,7 +118,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceAgentParam(db))
rtr.Get("/", nil)
@ -135,7 +135,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
t.Run("WorkspaceAgent", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{

8
coderd/httpmw/workspacebuildparam_test.go
View File

@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/cryptorand"
@ -73,7 +73,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
rtr.Get("/", nil)
@ -88,7 +88,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
rtr.Get("/", nil)
@ -105,7 +105,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
t.Run("WorkspaceBuild", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{

10
coderd/httpmw/workspaceparam_test.go
View File

@ -17,7 +17,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/httpmw"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/cryptorand"
@ -67,7 +67,7 @@ func TestWorkspaceParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceParam(db))
rtr.Get("/", nil)
@ -82,7 +82,7 @@ func TestWorkspaceParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceParam(db))
rtr.Get("/", nil)
@ -98,7 +98,7 @@ func TestWorkspaceParam(t *testing.T) {
t.Run("Found", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
@ -339,7 +339,7 @@ type setupConfig struct {
func setupWorkspaceWithAgents(t testing.TB, cfg setupConfig) (database.Store, *http.Request) {
t.Helper()
db := databasefake.New()
db := dbfake.New()
var (
id, secret = randomAPIKeyParts()
hashed = sha256.Sum256([]byte(secret))

10
coderd/httpmw/workspaceresourceparam_test.go
View File

@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/coderd/httpmw"
)
@ -46,7 +46,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
t.Run("None", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(httpmw.ExtractWorkspaceResourceParam(db))
rtr.Get("/", nil)
@ -61,7 +61,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
t.Run("NotFound", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractWorkspaceResourceParam(db),
@ -80,7 +80,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
t.Run("FoundBadJobType", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractWorkspaceResourceParam(db),
@ -102,7 +102,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
t.Run("Found", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
rtr := chi.NewRouter()
rtr.Use(
httpmw.ExtractWorkspaceResourceParam(db),

6
coderd/metricscache/metricscache_test.go
View File

@ -11,7 +11,7 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/metricscache"
"github.com/coder/coder/codersdk"
"github.com/coder/coder/testutil"
@ -162,7 +162,7 @@ func TestCache_TemplateUsers(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
var (
db = databasefake.New()
db = dbfake.New()
cache = metricscache.New(db, slogtest.Make(t, nil), testutil.IntervalFast)
)
@ -289,7 +289,7 @@ func TestCache_BuildTime(t *testing.T) {
ctx := context.Background()
var (
db = databasefake.New()
db = dbfake.New()
cache = metricscache.New(db, slogtest.Make(t, nil), testutil.IntervalFast)
)

14
coderd/parameter/compute_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/parameter"
"github.com/coder/coder/cryptorand"
)
@ -59,7 +59,7 @@ func TestCompute(t *testing.T) {
t.Run("NoValue", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
scope := generateScope()
_, err := db.InsertParameterSchema(context.Background(), database.InsertParameterSchemaParams{
ID: uuid.New(),
@ -77,7 +77,7 @@ func TestCompute(t *testing.T) {
t.Run("UseDefaultTemplateValue", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
scope := generateScope()
parameterSchema := generateParameter(t, db, parameterOptions{
TemplateImportJobID: scope.TemplateImportJobID,
@ -95,7 +95,7 @@ func TestCompute(t *testing.T) {
t.Run("TemplateOverridesTemplateDefault", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
scope := generateScope()
parameterSchema := generateParameter(t, db, parameterOptions{
TemplateImportJobID: scope.TemplateImportJobID,
@ -120,7 +120,7 @@ func TestCompute(t *testing.T) {
t.Run("WorkspaceCannotOverwriteTemplateDefault", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
scope := generateScope()
parameterSchema := generateParameter(t, db, parameterOptions{
TemplateImportJobID: scope.TemplateImportJobID,
@ -145,7 +145,7 @@ func TestCompute(t *testing.T) {
t.Run("WorkspaceOverwriteTemplateDefault", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
scope := generateScope()
parameterSchema := generateParameter(t, db, parameterOptions{
AllowOverrideSource: true,
@ -170,7 +170,7 @@ func TestCompute(t *testing.T) {
t.Run("HideRedisplay", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
scope := generateScope()
_ = generateParameter(t, db, parameterOptions{
TemplateImportJobID: scope.TemplateImportJobID,

14
coderd/prometheusmetrics/prometheusmetrics_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/coderd/prometheusmetrics"
"github.com/coder/coder/codersdk"
@ -29,13 +29,13 @@ func TestActiveUsers(t *testing.T) {
}{{
Name: "None",
Database: func(t *testing.T) database.Store {
return databasefake.New()
return dbfake.New()
},
Count: 0,
}, {
Name: "One",
Database: func(t *testing.T) database.Store {
db := databasefake.New()
db := dbfake.New()
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now(),
})
@ -45,7 +45,7 @@ func TestActiveUsers(t *testing.T) {
}, {
Name: "OneWithExpired",
Database: func(t *testing.T) database.Store {
db := databasefake.New()
db := dbfake.New()
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now(),
@ -62,7 +62,7 @@ func TestActiveUsers(t *testing.T) {
}, {
Name: "Multiple",
Database: func(t *testing.T) database.Store {
db := databasefake.New()
db := dbfake.New()
dbgen.APIKey(t, db, database.APIKey{
LastUsed: database.Now(),
})
@ -181,13 +181,13 @@ func TestWorkspaces(t *testing.T) {
}{{
Name: "None",
Database: func() database.Store {
return databasefake.New()
return dbfake.New()
},
Total: 0,
}, {
Name: "Multiple",
Database: func() database.Store {
db := databasefake.New()
db := dbfake.New()
insertCanceled(db)
insertFailed(db)
insertFailed(db)

14
coderd/provisionerdserver/provisionerdserver_test.go
View File

@ -15,7 +15,7 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/coderd/audit"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/coderd/provisionerdserver"
"github.com/coder/coder/coderd/telemetry"
@ -35,7 +35,7 @@ func TestAcquireJob(t *testing.T) {
t.Parallel()
t.Run("Debounce", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
pubsub := database.NewPubsubInMemory()
srv := &provisionerdserver.Server{
ID: uuid.New(),
@ -711,7 +711,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
}
t.Run("NoAgents", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
job := uuid.New()
err := insert(db, job, &sdkproto.Resource{
Name: "something",
@ -724,7 +724,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
})
t.Run("InvalidAgentToken", func(t *testing.T) {
t.Parallel()
err := insert(databasefake.New(), uuid.New(), &sdkproto.Resource{
err := insert(dbfake.New(), uuid.New(), &sdkproto.Resource{
Name: "something",
Type: "aws_instance",
Agents: []*sdkproto.Agent{{
@ -737,7 +737,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
})
t.Run("DuplicateApps", func(t *testing.T) {
t.Parallel()
err := insert(databasefake.New(), uuid.New(), &sdkproto.Resource{
err := insert(dbfake.New(), uuid.New(), &sdkproto.Resource{
Name: "something",
Type: "aws_instance",
Agents: []*sdkproto.Agent{{
@ -752,7 +752,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
})
t.Run("Success", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
job := uuid.New()
err := insert(db, job, &sdkproto.Resource{
Name: "something",
@ -798,7 +798,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
func setup(t *testing.T, ignoreLogErrors bool) *provisionerdserver.Server {
t.Helper()
db := databasefake.New()
db := dbfake.New()
pubsub := database.NewPubsubInMemory()
return &provisionerdserver.Server{

6
coderd/telemetry/telemetry_test.go
View File

@ -19,7 +19,7 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/buildinfo"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/telemetry"
)
@ -34,7 +34,7 @@ func TestTelemetry(t *testing.T) {
var err error
db := databasefake.New()
db := dbfake.New()
ctx := context.Background()
_, err = db.InsertAPIKey(ctx, database.InsertAPIKeyParams{
@ -132,7 +132,7 @@ func TestTelemetry(t *testing.T) {
})
t.Run("HashedEmail", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
_, err := db.InsertUser(context.Background(), database.InsertUserParams{
ID: uuid.New(),
Email: "kyle@coder.com",

6
coderd/updatecheck/updatecheck_test.go
View File

@ -14,7 +14,7 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/updatecheck"
"github.com/coder/coder/testutil"
)
@ -49,7 +49,7 @@ func TestChecker_Notify(t *testing.T) {
}))
defer srv.Close()
db := databasefake.New()
db := dbfake.New()
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Named(t.Name())
notify := make(chan updatecheck.Result, len(wantVersion))
c := updatecheck.New(db, logger, updatecheck.Options{
@ -131,7 +131,7 @@ func TestChecker_Latest(t *testing.T) {
}))
defer srv.Close()
db := databasefake.New()
db := dbfake.New()
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Named(t.Name())
c := updatecheck.New(db, logger, updatecheck.Options{
URL: srv.URL,

8
coderd/workspaceapps_internal_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/coder/coder/coderd/database"
"github.com/coder/coder/coderd/database/databasefake"
"github.com/coder/coder/coderd/database/dbfake"
"github.com/coder/coder/coderd/database/dbgen"
"github.com/coder/coder/testutil"
)
@ -30,7 +30,7 @@ func TestAPIKeyEncryption(t *testing.T) {
t.Run("OK", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
keyID, _, hashedSecret, data := generateAPIKey(t, db)
encrypted, err := encryptAPIKey(data)
@ -51,7 +51,7 @@ func TestAPIKeyEncryption(t *testing.T) {
t.Run("Expiry", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
_, _, _, data := generateAPIKey(t, db)
data.ExpiresAt = database.Now().Add(-1 * time.Hour)
@ -68,7 +68,7 @@ func TestAPIKeyEncryption(t *testing.T) {
t.Run("KeyMatches", func(t *testing.T) {
t.Parallel()
db := databasefake.New()
db := dbfake.New()
hashedSecret := sha256.Sum256([]byte("wrong"))
// Insert a token with a mismatched hashed secret.