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 dbfake to dbmem (#10432)

Browse Source
This commit is contained in:
Kyle Carberry
2023-10-30 17:42:20 +00: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
enterprise/coderd/coderd_test.go
+3 -3
View File
@@ -17,7 +17,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/dbtestutil"
"github.com/coder/coder/v2/coderd/database/dbtime"
"github.com/coder/coder/v2/coderd/rbac"
@@ -191,7 +191,7 @@ func TestAuditLogging(t *testing.T) {
_, _, api, _ := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
AuditLogging: true,
Options: &coderdtest.Options{
Auditor: audit.NewAuditor(dbfake.New(), audit.DefaultFilter),
Auditor: audit.NewAuditor(dbmem.New(), audit.DefaultFilter),
},
LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
@@ -200,7 +200,7 @@ func TestAuditLogging(t *testing.T) {
},
})
auditor := *api.AGPL.Auditor.Load()
ea := audit.NewAuditor(dbfake.New(), audit.DefaultFilter)
ea := audit.NewAuditor(dbmem.New(), audit.DefaultFilter)
t.Logf("%T = %T", auditor, ea)
assert.EqualValues(t, reflect.ValueOf(ea).Type(), reflect.ValueOf(auditor).Type())
})
enterprise/coderd/coderdenttest/coderdenttest.go
+3 -3
View File
@@ -10,7 +10,7 @@ import (
"testing"
"time"
"github.com/coder/coder/v2/coderd/database/dbfake"
"github.com/coder/coder/v2/coderd/database/dbmem"
"github.com/coder/coder/v2/coderd/database/pubsub"
"github.com/golang-jwt/jwt/v4"
@@ -133,8 +133,8 @@ func NewWithAPI(t *testing.T, options *Options) (
// we check for the in-memory test types so that the real types don't have to exported
_, ok := coderAPI.Pubsub.(*pubsub.MemoryPubsub)
require.False(t, ok, "FeatureHighAvailability is incompatible with MemoryPubsub")
_, ok = coderAPI.Database.(*dbfake.FakeQuerier)
require.False(t, ok, "FeatureHighAvailability is incompatible with dbfake")
_, ok = coderAPI.Database.(*dbmem.FakeQuerier)
require.False(t, ok, "FeatureHighAvailability is incompatible with dbmem")
}
}
_ = AddLicense(t, client, lo)
enterprise/coderd/dormancy/dormantusersjob_test.go
+2 -2
View File
@@ -11,7 +11,7 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"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/enterprise/coderd/dormancy"
"github.com/coder/coder/v2/testutil"
)
@@ -25,7 +25,7 @@ func TestCheckInactiveUsers(t *testing.T) {
// Add some dormant accounts
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true})
db := dbfake.New()
db := dbmem.New()
ctx, cancelFunc := context.WithCancel(context.Background())
t.Cleanup(cancelFunc)
enterprise/coderd/license/license_test.go
+23 -23
View File
@@ -11,7 +11,7 @@ import (
"cdr.dev/slog"
"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/dbtime"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
@@ -29,7 +29,7 @@ func TestEntitlements(t *testing.T) {
t.Run("Defaults", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.False(t, entitlements.HasLicense)
@@ -41,7 +41,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("Always return the current user count", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.False(t, entitlements.HasLicense)
@@ -50,7 +50,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("SingleLicenseNothing", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
Exp: time.Now().Add(time.Hour),
@@ -66,7 +66,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("SingleLicenseAll", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: func() license.Features {
@@ -89,7 +89,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("SingleLicenseGrace", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
@@ -115,7 +115,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("Expiration warning", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
@@ -144,7 +144,7 @@ func TestEntitlements(t *testing.T) {
t.Run("Expiration warning for license expiring in 1 day", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
@@ -173,7 +173,7 @@ func TestEntitlements(t *testing.T) {
t.Run("Expiration warning for trials", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
@@ -203,7 +203,7 @@ func TestEntitlements(t *testing.T) {
t.Run("Expiration warning for non trials", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
@@ -232,7 +232,7 @@ func TestEntitlements(t *testing.T) {
t.Run("SingleLicenseNotEntitled", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
Exp: time.Now().Add(time.Hour),
@@ -260,7 +260,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("TooManyUsers", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
activeUser1, err := db.InsertUser(context.Background(), database.InsertUserParams{
ID: uuid.New(),
Username: "test1",
@@ -306,7 +306,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("MaximizeUserLimit", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertUser(context.Background(), database.InsertUserParams{})
db.InsertUser(context.Background(), database.InsertUserParams{})
db.InsertLicense(context.Background(), database.InsertLicenseParams{
@@ -334,7 +334,7 @@ func TestEntitlements(t *testing.T) {
})
t.Run("MultipleLicenseEnabled", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
// One trial
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: time.Now().Add(time.Hour),
@@ -358,7 +358,7 @@ func TestEntitlements(t *testing.T) {
t.Run("AllFeatures", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: time.Now().Add(time.Hour),
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -380,7 +380,7 @@ func TestEntitlements(t *testing.T) {
t.Run("AllFeaturesAlwaysEnable", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: dbtime.Now().Add(time.Hour),
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -403,7 +403,7 @@ func TestEntitlements(t *testing.T) {
t.Run("AllFeaturesGrace", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: dbtime.Now().Add(time.Hour),
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -427,7 +427,7 @@ func TestEntitlements(t *testing.T) {
t.Run("MultipleReplicasNoLicense", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 2, 1, coderdenttest.Keys, all)
require.NoError(t, err)
require.False(t, entitlements.HasLicense)
@@ -437,7 +437,7 @@ func TestEntitlements(t *testing.T) {
t.Run("MultipleReplicasNotEntitled", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: time.Now().Add(time.Hour),
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -457,7 +457,7 @@ func TestEntitlements(t *testing.T) {
t.Run("MultipleReplicasGrace", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
Features: license.Features{
@@ -479,7 +479,7 @@ func TestEntitlements(t *testing.T) {
t.Run("MultipleGitAuthNoLicense", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 2, coderdenttest.Keys, all)
require.NoError(t, err)
require.False(t, entitlements.HasLicense)
@@ -489,7 +489,7 @@ func TestEntitlements(t *testing.T) {
t.Run("MultipleGitAuthNotEntitled", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
Exp: time.Now().Add(time.Hour),
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
@@ -509,7 +509,7 @@ func TestEntitlements(t *testing.T) {
t.Run("MultipleGitAuthGrace", func(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
db.InsertLicense(context.Background(), database.InsertLicenseParams{
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
GraceAt: time.Now().Add(-time.Hour),
enterprise/coderd/proxyhealth/proxyhealth_test.go
+5 -5
View File
@@ -12,8 +12,8 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"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/httpapi"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/enterprise/coderd/proxyhealth"
@@ -46,7 +46,7 @@ func TestProxyHealth_Nil(t *testing.T) {
func TestProxyHealth_Unregistered(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
proxies := []database.WorkspaceProxy{
insertProxy(t, db, ""),
@@ -72,7 +72,7 @@ func TestProxyHealth_Unregistered(t *testing.T) {
func TestProxyHealth_Unhealthy(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
srvBadReport := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
httpapi.Write(context.Background(), w, http.StatusOK, codersdk.ProxyHealthReport{
@@ -112,7 +112,7 @@ func TestProxyHealth_Unhealthy(t *testing.T) {
func TestProxyHealth_Reachable(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
httpapi.Write(context.Background(), w, http.StatusOK, codersdk.ProxyHealthReport{
@@ -147,7 +147,7 @@ func TestProxyHealth_Reachable(t *testing.T) {
func TestProxyHealth_Unreachable(t *testing.T) {
t.Parallel()
db := dbfake.New()
db := dbmem.New()
cli := &http.Client{
Transport: &http.Transport{