opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08: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
coderd/httpmw/apikey_test.go
+20 -20
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,
coderd/httpmw/groupparam_test.go
+3 -3
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()
coderd/httpmw/organizationparam_test.go
+6 -6
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()
coderd/httpmw/ratelimit_test.go
+3 -3
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()},
coderd/httpmw/templateparam_test.go
+5 -5
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{
coderd/httpmw/templateversionparam_test.go
+4 -4
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{
coderd/httpmw/userparam_test.go
+2 -2
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)
coderd/httpmw/workspaceagent_test.go
+3 -3
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),
coderd/httpmw/workspaceagentparam_test.go
+4 -4
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{
coderd/httpmw/workspacebuildparam_test.go
+4 -4
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{
coderd/httpmw/workspaceparam_test.go
+5 -5
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))
coderd/httpmw/workspaceresourceparam_test.go
+5 -5
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),