mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
chore: Rename databasefake --> dbfake (#6011)
This commit is contained in:
+3
-3
@@ -61,7 +61,7 @@ import (
|
|||||||
"github.com/coder/coder/coderd"
|
"github.com/coder/coder/coderd"
|
||||||
"github.com/coder/coder/coderd/autobuild/executor"
|
"github.com/coder/coder/coderd/autobuild/executor"
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/migrations"
|
"github.com/coder/coder/coderd/database/migrations"
|
||||||
"github.com/coder/coder/coderd/devtunnel"
|
"github.com/coder/coder/coderd/devtunnel"
|
||||||
"github.com/coder/coder/coderd/gitauth"
|
"github.com/coder/coder/coderd/gitauth"
|
||||||
@@ -461,7 +461,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
|
|||||||
AppHostname: appHostname,
|
AppHostname: appHostname,
|
||||||
AppHostnameRegex: appHostnameRegex,
|
AppHostnameRegex: appHostnameRegex,
|
||||||
Logger: logger.Named("coderd"),
|
Logger: logger.Named("coderd"),
|
||||||
Database: databasefake.New(),
|
Database: dbfake.New(),
|
||||||
DERPMap: derpMap,
|
DERPMap: derpMap,
|
||||||
Pubsub: database.NewPubsubInMemory(),
|
Pubsub: database.NewPubsubInMemory(),
|
||||||
CacheDir: cacheDir,
|
CacheDir: cacheDir,
|
||||||
@@ -560,7 +560,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
|
|||||||
}
|
}
|
||||||
|
|
||||||
if cfg.InMemoryDatabase.Value {
|
if cfg.InMemoryDatabase.Value {
|
||||||
options.Database = databasefake.New()
|
options.Database = dbfake.New()
|
||||||
options.Pubsub = database.NewPubsubInMemory()
|
options.Pubsub = database.NewPubsubInMemory()
|
||||||
} else {
|
} else {
|
||||||
logger.Debug(ctx, "connecting to postgresql")
|
logger.Debug(ctx, "connecting to postgresql")
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database/databasefake"
|
"github.com/coder/coder/coderd/database/dbfake"
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/stretchr/testify/assert"
|
"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
|
// 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
|
// still uses rego. So this boolean indicates how to assert the expected
|
||||||
// behavior.
|
// behavior.
|
||||||
_, isMemoryDB := a.api.Database.(databasefake.FakeDatabase)
|
_, isMemoryDB := a.api.Database.(dbfake.FakeDatabase)
|
||||||
|
|
||||||
// Some quick reused objects
|
// Some quick reused objects
|
||||||
workspaceRBACObj := rbac.ResourceWorkspace.WithID(a.Workspace.ID).InOrg(a.Organization.ID).WithOwner(a.Workspace.OwnerID.String())
|
workspaceRBACObj := rbac.ResourceWorkspace.WithID(a.Workspace.ID).InOrg(a.Organization.ID).WithOwner(a.Workspace.OwnerID.String())
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package databasefake
|
package dbfake
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
+4
-4
@@ -1,4 +1,4 @@
|
|||||||
package databasefake_test
|
package dbfake_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@@ -12,14 +12,14 @@ import (
|
|||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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.
|
// test that transactions don't deadlock, and that we don't see intermediate state.
|
||||||
func TestInTx(t *testing.T) {
|
func TestInTx(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
uut := databasefake.New()
|
uut := dbfake.New()
|
||||||
|
|
||||||
inTx := make(chan any)
|
inTx := make(chan any)
|
||||||
queriesDone := make(chan any)
|
queriesDone := make(chan any)
|
||||||
@@ -77,7 +77,7 @@ func TestExactMethods(t *testing.T) {
|
|||||||
"IsFakeDB": "Helper function used for unit testing",
|
"IsFakeDB": "Helper function used for unit testing",
|
||||||
}
|
}
|
||||||
|
|
||||||
fake := reflect.TypeOf(databasefake.New())
|
fake := reflect.TypeOf(dbfake.New())
|
||||||
fakeMethods := methods(fake)
|
fakeMethods := methods(fake)
|
||||||
|
|
||||||
store := reflect.TypeOf((*database.Store)(nil)).Elem()
|
store := reflect.TypeOf((*database.Store)(nil)).Elem()
|
||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ func TestGenerator(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("AuditLog", func(t *testing.T) {
|
t.Run("AuditLog", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
_ = dbgen.AuditLog(t, db, database.AuditLog{})
|
_ = dbgen.AuditLog(t, db, database.AuditLog{})
|
||||||
logs := must(db.GetAuditLogsOffset(context.Background(), database.GetAuditLogsOffsetParams{Limit: 1}))
|
logs := must(db.GetAuditLogsOffset(context.Background(), database.GetAuditLogsOffsetParams{Limit: 1}))
|
||||||
require.Len(t, logs, 1)
|
require.Len(t, logs, 1)
|
||||||
@@ -25,56 +25,56 @@ func TestGenerator(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("APIKey", func(t *testing.T) {
|
t.Run("APIKey", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp, _ := dbgen.APIKey(t, db, database.APIKey{})
|
exp, _ := dbgen.APIKey(t, db, database.APIKey{})
|
||||||
require.Equal(t, exp, must(db.GetAPIKeyByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetAPIKeyByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("File", func(t *testing.T) {
|
t.Run("File", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.File(t, db, database.File{})
|
exp := dbgen.File(t, db, database.File{})
|
||||||
require.Equal(t, exp, must(db.GetFileByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetFileByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("UserLink", func(t *testing.T) {
|
t.Run("UserLink", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.UserLink(t, db, database.UserLink{})
|
exp := dbgen.UserLink(t, db, database.UserLink{})
|
||||||
require.Equal(t, exp, must(db.GetUserLinkByLinkedID(context.Background(), exp.LinkedID)))
|
require.Equal(t, exp, must(db.GetUserLinkByLinkedID(context.Background(), exp.LinkedID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("WorkspaceResource", func(t *testing.T) {
|
t.Run("WorkspaceResource", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{})
|
exp := dbgen.WorkspaceResource(t, db, database.WorkspaceResource{})
|
||||||
require.Equal(t, exp, must(db.GetWorkspaceResourceByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetWorkspaceResourceByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("WorkspaceResourceMetadatum", func(t *testing.T) {
|
t.Run("WorkspaceResourceMetadatum", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.WorkspaceResourceMetadatums(t, db, database.WorkspaceResourceMetadatum{})
|
exp := dbgen.WorkspaceResourceMetadatums(t, db, database.WorkspaceResourceMetadatum{})
|
||||||
require.Equal(t, exp, must(db.GetWorkspaceResourceMetadataByResourceIDs(context.Background(), []uuid.UUID{exp[0].WorkspaceResourceID})))
|
require.Equal(t, exp, must(db.GetWorkspaceResourceMetadataByResourceIDs(context.Background(), []uuid.UUID{exp[0].WorkspaceResourceID})))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Job", func(t *testing.T) {
|
t.Run("Job", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
|
exp := dbgen.ProvisionerJob(t, db, database.ProvisionerJob{})
|
||||||
require.Equal(t, exp, must(db.GetProvisionerJobByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetProvisionerJobByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Group", func(t *testing.T) {
|
t.Run("Group", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.Group(t, db, database.Group{})
|
exp := dbgen.Group(t, db, database.Group{})
|
||||||
require.Equal(t, exp, must(db.GetGroupByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetGroupByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("GroupMember", func(t *testing.T) {
|
t.Run("GroupMember", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
g := dbgen.Group(t, db, database.Group{})
|
g := dbgen.Group(t, db, database.Group{})
|
||||||
u := dbgen.User(t, db, database.User{})
|
u := dbgen.User(t, db, database.User{})
|
||||||
exp := []database.User{u}
|
exp := []database.User{u}
|
||||||
@@ -85,14 +85,14 @@ func TestGenerator(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Organization", func(t *testing.T) {
|
t.Run("Organization", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.Organization(t, db, database.Organization{})
|
exp := dbgen.Organization(t, db, database.Organization{})
|
||||||
require.Equal(t, exp, must(db.GetOrganizationByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetOrganizationByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("OrganizationMember", func(t *testing.T) {
|
t.Run("OrganizationMember", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.OrganizationMember(t, db, database.OrganizationMember{})
|
exp := dbgen.OrganizationMember(t, db, database.OrganizationMember{})
|
||||||
require.Equal(t, exp, must(db.GetOrganizationMemberByUserID(context.Background(), database.GetOrganizationMemberByUserIDParams{
|
require.Equal(t, exp, must(db.GetOrganizationMemberByUserID(context.Background(), database.GetOrganizationMemberByUserIDParams{
|
||||||
OrganizationID: exp.OrganizationID,
|
OrganizationID: exp.OrganizationID,
|
||||||
@@ -102,42 +102,42 @@ func TestGenerator(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Workspace", func(t *testing.T) {
|
t.Run("Workspace", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.Workspace(t, db, database.Workspace{})
|
exp := dbgen.Workspace(t, db, database.Workspace{})
|
||||||
require.Equal(t, exp, must(db.GetWorkspaceByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetWorkspaceByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("WorkspaceAgent", func(t *testing.T) {
|
t.Run("WorkspaceAgent", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{})
|
exp := dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{})
|
||||||
require.Equal(t, exp, must(db.GetWorkspaceAgentByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetWorkspaceAgentByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Template", func(t *testing.T) {
|
t.Run("Template", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.Template(t, db, database.Template{})
|
exp := dbgen.Template(t, db, database.Template{})
|
||||||
require.Equal(t, exp, must(db.GetTemplateByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetTemplateByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("TemplateVersion", func(t *testing.T) {
|
t.Run("TemplateVersion", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.TemplateVersion(t, db, database.TemplateVersion{})
|
exp := dbgen.TemplateVersion(t, db, database.TemplateVersion{})
|
||||||
require.Equal(t, exp, must(db.GetTemplateVersionByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetTemplateVersionByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("ParameterSchema", func(t *testing.T) {
|
t.Run("ParameterSchema", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.ParameterSchema(t, db, database.ParameterSchema{})
|
exp := dbgen.ParameterSchema(t, db, database.ParameterSchema{})
|
||||||
require.Equal(t, []database.ParameterSchema{exp}, must(db.GetParameterSchemasByJobID(context.Background(), exp.JobID)))
|
require.Equal(t, []database.ParameterSchema{exp}, must(db.GetParameterSchemasByJobID(context.Background(), exp.JobID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("ParameterValue", func(t *testing.T) {
|
t.Run("ParameterValue", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.ParameterValue(t, db, database.ParameterValue{})
|
exp := dbgen.ParameterValue(t, db, database.ParameterValue{})
|
||||||
require.Equal(t, exp, must(db.GetParameterValueByScopeAndName(context.Background(), database.GetParameterValueByScopeAndNameParams{
|
require.Equal(t, exp, must(db.GetParameterValueByScopeAndName(context.Background(), database.GetParameterValueByScopeAndNameParams{
|
||||||
Scope: exp.Scope,
|
Scope: exp.Scope,
|
||||||
@@ -148,14 +148,14 @@ func TestGenerator(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("WorkspaceBuild", func(t *testing.T) {
|
t.Run("WorkspaceBuild", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{})
|
exp := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{})
|
||||||
require.Equal(t, exp, must(db.GetWorkspaceBuildByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetWorkspaceBuildByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("User", func(t *testing.T) {
|
t.Run("User", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
exp := dbgen.User(t, db, database.User{})
|
exp := dbgen.User(t, db, database.User{})
|
||||||
require.Equal(t, exp, must(db.GetUserByID(context.Background(), exp.ID)))
|
require.Equal(t, exp, must(db.GetUserByID(context.Background(), exp.ID)))
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -9,14 +9,14 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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"
|
"github.com/coder/coder/coderd/database/postgres"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewDB(t *testing.T) (database.Store, database.Pubsub) {
|
func NewDB(t *testing.T) (database.Store, database.Pubsub) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
pubsub := database.NewPubsubInMemory()
|
pubsub := database.NewPubsubInMemory()
|
||||||
if os.Getenv("DB") != "" {
|
if os.Getenv("DB") != "" {
|
||||||
connectionURL := os.Getenv("CODER_PG_CONNECTION_URL")
|
connectionURL := os.Getenv("CODER_PG_CONNECTION_URL")
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import (
|
|||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
"github.com/coder/coder/coderd/httpapi"
|
"github.com/coder/coder/coderd/httpapi"
|
||||||
"github.com/coder/coder/coderd/httpmw"
|
"github.com/coder/coder/coderd/httpmw"
|
||||||
@@ -43,7 +43,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("NoCookie", func(t *testing.T) {
|
t.Run("NoCookie", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
)
|
)
|
||||||
@@ -59,7 +59,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("NoCookieRedirects", func(t *testing.T) {
|
t.Run("NoCookieRedirects", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
)
|
)
|
||||||
@@ -78,7 +78,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("InvalidFormat", func(t *testing.T) {
|
t.Run("InvalidFormat", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
)
|
)
|
||||||
@@ -96,7 +96,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("InvalidIDLength", func(t *testing.T) {
|
t.Run("InvalidIDLength", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
)
|
)
|
||||||
@@ -114,7 +114,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("InvalidSecretLength", func(t *testing.T) {
|
t.Run("InvalidSecretLength", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
)
|
)
|
||||||
@@ -132,7 +132,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
id, secret = randomAPIKeyParts()
|
id, secret = randomAPIKeyParts()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
@@ -151,7 +151,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("InvalidSecret", func(t *testing.T) {
|
t.Run("InvalidSecret", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
@@ -176,7 +176,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("Expired", func(t *testing.T) {
|
t.Run("Expired", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
_, token = dbgen.APIKey(t, db, database.APIKey{
|
_, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -200,7 +200,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("Valid", func(t *testing.T) {
|
t.Run("Valid", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -235,7 +235,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("ValidWithScope", func(t *testing.T) {
|
t.Run("ValidWithScope", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
_, token = dbgen.APIKey(t, db, database.APIKey{
|
_, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -272,7 +272,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("QueryParameter", func(t *testing.T) {
|
t.Run("QueryParameter", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
_, token = dbgen.APIKey(t, db, database.APIKey{
|
_, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -304,7 +304,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("ValidUpdateLastUsed", func(t *testing.T) {
|
t.Run("ValidUpdateLastUsed", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -335,7 +335,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("ValidUpdateExpiry", func(t *testing.T) {
|
t.Run("ValidUpdateExpiry", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -366,7 +366,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("OAuthNotExpired", func(t *testing.T) {
|
t.Run("OAuthNotExpired", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -402,7 +402,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("OAuthRefresh", func(t *testing.T) {
|
t.Run("OAuthRefresh", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -452,7 +452,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("RemoteIPUpdates", func(t *testing.T) {
|
t.Run("RemoteIPUpdates", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
@@ -483,7 +483,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("RedirectToLogin", func(t *testing.T) {
|
t.Run("RedirectToLogin", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
)
|
)
|
||||||
@@ -504,7 +504,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("Optional", func(t *testing.T) {
|
t.Run("Optional", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
|
|
||||||
@@ -535,7 +535,7 @@ func TestAPIKey(t *testing.T) {
|
|||||||
t.Run("Tokens", func(t *testing.T) {
|
t.Run("Tokens", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
user = dbgen.User(t, db, database.User{})
|
user = dbgen.User(t, db, database.User{})
|
||||||
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
sentAPIKey, token = dbgen.APIKey(t, db, database.APIKey{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
"github.com/coder/coder/coderd/httpmw"
|
"github.com/coder/coder/coderd/httpmw"
|
||||||
)
|
)
|
||||||
@@ -23,7 +23,7 @@ func TestGroupParam(t *testing.T) {
|
|||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
group = dbgen.Group(t, db, database.Group{})
|
group = dbgen.Group(t, db, database.Group{})
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
@@ -52,7 +52,7 @@ func TestGroupParam(t *testing.T) {
|
|||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
group = dbgen.Group(t, db, database.Group{})
|
group = dbgen.Group(t, db, database.Group{})
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
w = httptest.NewRecorder()
|
w = httptest.NewRecorder()
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/cryptorand"
|
"github.com/coder/coder/cryptorand"
|
||||||
@@ -62,7 +62,7 @@ func TestOrganizationParam(t *testing.T) {
|
|||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
r, _ = setupAuthentication(db)
|
r, _ = setupAuthentication(db)
|
||||||
rtr = chi.NewRouter()
|
rtr = chi.NewRouter()
|
||||||
@@ -84,7 +84,7 @@ func TestOrganizationParam(t *testing.T) {
|
|||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
r, _ = setupAuthentication(db)
|
r, _ = setupAuthentication(db)
|
||||||
rtr = chi.NewRouter()
|
rtr = chi.NewRouter()
|
||||||
@@ -107,7 +107,7 @@ func TestOrganizationParam(t *testing.T) {
|
|||||||
t.Run("InvalidUUID", func(t *testing.T) {
|
t.Run("InvalidUUID", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
r, _ = setupAuthentication(db)
|
r, _ = setupAuthentication(db)
|
||||||
rtr = chi.NewRouter()
|
rtr = chi.NewRouter()
|
||||||
@@ -130,7 +130,7 @@ func TestOrganizationParam(t *testing.T) {
|
|||||||
t.Run("NotInOrganization", func(t *testing.T) {
|
t.Run("NotInOrganization", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
r, u = setupAuthentication(db)
|
r, u = setupAuthentication(db)
|
||||||
rtr = chi.NewRouter()
|
rtr = chi.NewRouter()
|
||||||
@@ -163,7 +163,7 @@ func TestOrganizationParam(t *testing.T) {
|
|||||||
t.Run("Success", func(t *testing.T) {
|
t.Run("Success", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
rw = httptest.NewRecorder()
|
rw = httptest.NewRecorder()
|
||||||
r, user = setupAuthentication(db)
|
r, user = setupAuthentication(db)
|
||||||
rtr = chi.NewRouter()
|
rtr = chi.NewRouter()
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
"github.com/coder/coder/coderd/httpmw"
|
"github.com/coder/coder/coderd/httpmw"
|
||||||
"github.com/coder/coder/coderd/rbac"
|
"github.com/coder/coder/coderd/rbac"
|
||||||
@@ -71,7 +71,7 @@ func TestRateLimit(t *testing.T) {
|
|||||||
t.Run("RegularUser", func(t *testing.T) {
|
t.Run("RegularUser", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
u := dbgen.User(t, db, database.User{})
|
u := dbgen.User(t, db, database.User{})
|
||||||
_, key := dbgen.APIKey(t, db, database.APIKey{UserID: u.ID})
|
_, 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.Run("OwnerBypass", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
|
|
||||||
u := dbgen.User(t, db, database.User{
|
u := dbgen.User(t, db, database.User{
|
||||||
RBACRoles: []string{rbac.RoleOwner()},
|
RBACRoles: []string{rbac.RoleOwner()},
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/cryptorand"
|
"github.com/coder/coder/cryptorand"
|
||||||
@@ -81,7 +81,7 @@ func TestTemplateParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractTemplateParam(db))
|
rtr.Use(httpmw.ExtractTemplateParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -96,7 +96,7 @@ func TestTemplateParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractTemplateParam(db))
|
rtr.Use(httpmw.ExtractTemplateParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -113,7 +113,7 @@ func TestTemplateParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("BadUUID", func(t *testing.T) {
|
t.Run("BadUUID", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractTemplateParam(db))
|
rtr.Use(httpmw.ExtractTemplateParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -130,7 +130,7 @@ func TestTemplateParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Template", func(t *testing.T) {
|
t.Run("Template", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/cryptorand"
|
"github.com/coder/coder/cryptorand"
|
||||||
@@ -91,7 +91,7 @@ func TestTemplateVersionParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractTemplateVersionParam(db))
|
rtr.Use(httpmw.ExtractTemplateVersionParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -106,7 +106,7 @@ func TestTemplateVersionParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractTemplateVersionParam(db))
|
rtr.Use(httpmw.ExtractTemplateVersionParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -123,7 +123,7 @@ func TestTemplateVersionParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("TemplateVersion", func(t *testing.T) {
|
t.Run("TemplateVersion", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
)
|
)
|
||||||
@@ -23,7 +23,7 @@ func TestUserParam(t *testing.T) {
|
|||||||
t.Parallel()
|
t.Parallel()
|
||||||
setup := func(t *testing.T) (database.Store, *httptest.ResponseRecorder, *http.Request) {
|
setup := func(t *testing.T) (database.Store, *httptest.ResponseRecorder, *http.Request) {
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
id, secret = randomAPIKeyParts()
|
id, secret = randomAPIKeyParts()
|
||||||
hashed = sha256.Sum256([]byte(secret))
|
hashed = sha256.Sum256([]byte(secret))
|
||||||
r = httptest.NewRequest("GET", "/", nil)
|
r = httptest.NewRequest("GET", "/", nil)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
)
|
)
|
||||||
@@ -28,7 +28,7 @@ func TestWorkspaceAgent(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractWorkspaceAgent(db),
|
httpmw.ExtractWorkspaceAgent(db),
|
||||||
@@ -45,7 +45,7 @@ func TestWorkspaceAgent(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Found", func(t *testing.T) {
|
t.Run("Found", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractWorkspaceAgent(db),
|
httpmw.ExtractWorkspaceAgent(db),
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/cryptorand"
|
"github.com/coder/coder/cryptorand"
|
||||||
@@ -103,7 +103,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
|
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -118,7 +118,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractWorkspaceAgentParam(db))
|
rtr.Use(httpmw.ExtractWorkspaceAgentParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -135,7 +135,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("WorkspaceAgent", func(t *testing.T) {
|
t.Run("WorkspaceAgent", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/cryptorand"
|
"github.com/coder/coder/cryptorand"
|
||||||
@@ -73,7 +73,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
|
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -88,7 +88,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
|
rtr.Use(httpmw.ExtractWorkspaceBuildParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -105,7 +105,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("WorkspaceBuild", func(t *testing.T) {
|
t.Run("WorkspaceBuild", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/httpmw"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/cryptorand"
|
"github.com/coder/coder/cryptorand"
|
||||||
@@ -67,7 +67,7 @@ func TestWorkspaceParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractWorkspaceParam(db))
|
rtr.Use(httpmw.ExtractWorkspaceParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -82,7 +82,7 @@ func TestWorkspaceParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractWorkspaceParam(db))
|
rtr.Use(httpmw.ExtractWorkspaceParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -98,7 +98,7 @@ func TestWorkspaceParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Found", func(t *testing.T) {
|
t.Run("Found", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
httpmw.ExtractAPIKey(httpmw.ExtractAPIKeyConfig{
|
||||||
@@ -339,7 +339,7 @@ type setupConfig struct {
|
|||||||
|
|
||||||
func setupWorkspaceWithAgents(t testing.TB, cfg setupConfig) (database.Store, *http.Request) {
|
func setupWorkspaceWithAgents(t testing.TB, cfg setupConfig) (database.Store, *http.Request) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
var (
|
var (
|
||||||
id, secret = randomAPIKeyParts()
|
id, secret = randomAPIKeyParts()
|
||||||
hashed = sha256.Sum256([]byte(secret))
|
hashed = sha256.Sum256([]byte(secret))
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
"github.com/coder/coder/coderd/httpmw"
|
"github.com/coder/coder/coderd/httpmw"
|
||||||
)
|
)
|
||||||
@@ -46,7 +46,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("None", func(t *testing.T) {
|
t.Run("None", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(httpmw.ExtractWorkspaceResourceParam(db))
|
rtr.Use(httpmw.ExtractWorkspaceResourceParam(db))
|
||||||
rtr.Get("/", nil)
|
rtr.Get("/", nil)
|
||||||
@@ -61,7 +61,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("NotFound", func(t *testing.T) {
|
t.Run("NotFound", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractWorkspaceResourceParam(db),
|
httpmw.ExtractWorkspaceResourceParam(db),
|
||||||
@@ -80,7 +80,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("FoundBadJobType", func(t *testing.T) {
|
t.Run("FoundBadJobType", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractWorkspaceResourceParam(db),
|
httpmw.ExtractWorkspaceResourceParam(db),
|
||||||
@@ -102,7 +102,7 @@ func TestWorkspaceResourceParam(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Found", func(t *testing.T) {
|
t.Run("Found", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
rtr := chi.NewRouter()
|
rtr := chi.NewRouter()
|
||||||
rtr.Use(
|
rtr.Use(
|
||||||
httpmw.ExtractWorkspaceResourceParam(db),
|
httpmw.ExtractWorkspaceResourceParam(db),
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
|
|
||||||
"cdr.dev/slog/sloggers/slogtest"
|
"cdr.dev/slog/sloggers/slogtest"
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/metricscache"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/testutil"
|
"github.com/coder/coder/testutil"
|
||||||
@@ -162,7 +162,7 @@ func TestCache_TemplateUsers(t *testing.T) {
|
|||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
cache = metricscache.New(db, slogtest.Make(t, nil), testutil.IntervalFast)
|
cache = metricscache.New(db, slogtest.Make(t, nil), testutil.IntervalFast)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -289,7 +289,7 @@ func TestCache_BuildTime(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
var (
|
var (
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
cache = metricscache.New(db, slogtest.Make(t, nil), testutil.IntervalFast)
|
cache = metricscache.New(db, slogtest.Make(t, nil), testutil.IntervalFast)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/coderd/parameter"
|
||||||
"github.com/coder/coder/cryptorand"
|
"github.com/coder/coder/cryptorand"
|
||||||
)
|
)
|
||||||
@@ -59,7 +59,7 @@ func TestCompute(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("NoValue", func(t *testing.T) {
|
t.Run("NoValue", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
scope := generateScope()
|
scope := generateScope()
|
||||||
_, err := db.InsertParameterSchema(context.Background(), database.InsertParameterSchemaParams{
|
_, err := db.InsertParameterSchema(context.Background(), database.InsertParameterSchemaParams{
|
||||||
ID: uuid.New(),
|
ID: uuid.New(),
|
||||||
@@ -77,7 +77,7 @@ func TestCompute(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("UseDefaultTemplateValue", func(t *testing.T) {
|
t.Run("UseDefaultTemplateValue", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
scope := generateScope()
|
scope := generateScope()
|
||||||
parameterSchema := generateParameter(t, db, parameterOptions{
|
parameterSchema := generateParameter(t, db, parameterOptions{
|
||||||
TemplateImportJobID: scope.TemplateImportJobID,
|
TemplateImportJobID: scope.TemplateImportJobID,
|
||||||
@@ -95,7 +95,7 @@ func TestCompute(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("TemplateOverridesTemplateDefault", func(t *testing.T) {
|
t.Run("TemplateOverridesTemplateDefault", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
scope := generateScope()
|
scope := generateScope()
|
||||||
parameterSchema := generateParameter(t, db, parameterOptions{
|
parameterSchema := generateParameter(t, db, parameterOptions{
|
||||||
TemplateImportJobID: scope.TemplateImportJobID,
|
TemplateImportJobID: scope.TemplateImportJobID,
|
||||||
@@ -120,7 +120,7 @@ func TestCompute(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("WorkspaceCannotOverwriteTemplateDefault", func(t *testing.T) {
|
t.Run("WorkspaceCannotOverwriteTemplateDefault", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
scope := generateScope()
|
scope := generateScope()
|
||||||
parameterSchema := generateParameter(t, db, parameterOptions{
|
parameterSchema := generateParameter(t, db, parameterOptions{
|
||||||
TemplateImportJobID: scope.TemplateImportJobID,
|
TemplateImportJobID: scope.TemplateImportJobID,
|
||||||
@@ -145,7 +145,7 @@ func TestCompute(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("WorkspaceOverwriteTemplateDefault", func(t *testing.T) {
|
t.Run("WorkspaceOverwriteTemplateDefault", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
scope := generateScope()
|
scope := generateScope()
|
||||||
parameterSchema := generateParameter(t, db, parameterOptions{
|
parameterSchema := generateParameter(t, db, parameterOptions{
|
||||||
AllowOverrideSource: true,
|
AllowOverrideSource: true,
|
||||||
@@ -170,7 +170,7 @@ func TestCompute(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("HideRedisplay", func(t *testing.T) {
|
t.Run("HideRedisplay", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
scope := generateScope()
|
scope := generateScope()
|
||||||
_ = generateParameter(t, db, parameterOptions{
|
_ = generateParameter(t, db, parameterOptions{
|
||||||
TemplateImportJobID: scope.TemplateImportJobID,
|
TemplateImportJobID: scope.TemplateImportJobID,
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
"github.com/coder/coder/coderd/prometheusmetrics"
|
"github.com/coder/coder/coderd/prometheusmetrics"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
@@ -29,13 +29,13 @@ func TestActiveUsers(t *testing.T) {
|
|||||||
}{{
|
}{{
|
||||||
Name: "None",
|
Name: "None",
|
||||||
Database: func(t *testing.T) database.Store {
|
Database: func(t *testing.T) database.Store {
|
||||||
return databasefake.New()
|
return dbfake.New()
|
||||||
},
|
},
|
||||||
Count: 0,
|
Count: 0,
|
||||||
}, {
|
}, {
|
||||||
Name: "One",
|
Name: "One",
|
||||||
Database: func(t *testing.T) database.Store {
|
Database: func(t *testing.T) database.Store {
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
dbgen.APIKey(t, db, database.APIKey{
|
dbgen.APIKey(t, db, database.APIKey{
|
||||||
LastUsed: database.Now(),
|
LastUsed: database.Now(),
|
||||||
})
|
})
|
||||||
@@ -45,7 +45,7 @@ func TestActiveUsers(t *testing.T) {
|
|||||||
}, {
|
}, {
|
||||||
Name: "OneWithExpired",
|
Name: "OneWithExpired",
|
||||||
Database: func(t *testing.T) database.Store {
|
Database: func(t *testing.T) database.Store {
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
|
|
||||||
dbgen.APIKey(t, db, database.APIKey{
|
dbgen.APIKey(t, db, database.APIKey{
|
||||||
LastUsed: database.Now(),
|
LastUsed: database.Now(),
|
||||||
@@ -62,7 +62,7 @@ func TestActiveUsers(t *testing.T) {
|
|||||||
}, {
|
}, {
|
||||||
Name: "Multiple",
|
Name: "Multiple",
|
||||||
Database: func(t *testing.T) database.Store {
|
Database: func(t *testing.T) database.Store {
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
dbgen.APIKey(t, db, database.APIKey{
|
dbgen.APIKey(t, db, database.APIKey{
|
||||||
LastUsed: database.Now(),
|
LastUsed: database.Now(),
|
||||||
})
|
})
|
||||||
@@ -181,13 +181,13 @@ func TestWorkspaces(t *testing.T) {
|
|||||||
}{{
|
}{{
|
||||||
Name: "None",
|
Name: "None",
|
||||||
Database: func() database.Store {
|
Database: func() database.Store {
|
||||||
return databasefake.New()
|
return dbfake.New()
|
||||||
},
|
},
|
||||||
Total: 0,
|
Total: 0,
|
||||||
}, {
|
}, {
|
||||||
Name: "Multiple",
|
Name: "Multiple",
|
||||||
Database: func() database.Store {
|
Database: func() database.Store {
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
insertCanceled(db)
|
insertCanceled(db)
|
||||||
insertFailed(db)
|
insertFailed(db)
|
||||||
insertFailed(db)
|
insertFailed(db)
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import (
|
|||||||
"cdr.dev/slog/sloggers/slogtest"
|
"cdr.dev/slog/sloggers/slogtest"
|
||||||
"github.com/coder/coder/coderd/audit"
|
"github.com/coder/coder/coderd/audit"
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
"github.com/coder/coder/coderd/provisionerdserver"
|
"github.com/coder/coder/coderd/provisionerdserver"
|
||||||
"github.com/coder/coder/coderd/telemetry"
|
"github.com/coder/coder/coderd/telemetry"
|
||||||
@@ -35,7 +35,7 @@ func TestAcquireJob(t *testing.T) {
|
|||||||
t.Parallel()
|
t.Parallel()
|
||||||
t.Run("Debounce", func(t *testing.T) {
|
t.Run("Debounce", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
pubsub := database.NewPubsubInMemory()
|
pubsub := database.NewPubsubInMemory()
|
||||||
srv := &provisionerdserver.Server{
|
srv := &provisionerdserver.Server{
|
||||||
ID: uuid.New(),
|
ID: uuid.New(),
|
||||||
@@ -711,7 +711,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
|
|||||||
}
|
}
|
||||||
t.Run("NoAgents", func(t *testing.T) {
|
t.Run("NoAgents", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
job := uuid.New()
|
job := uuid.New()
|
||||||
err := insert(db, job, &sdkproto.Resource{
|
err := insert(db, job, &sdkproto.Resource{
|
||||||
Name: "something",
|
Name: "something",
|
||||||
@@ -724,7 +724,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("InvalidAgentToken", func(t *testing.T) {
|
t.Run("InvalidAgentToken", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
err := insert(databasefake.New(), uuid.New(), &sdkproto.Resource{
|
err := insert(dbfake.New(), uuid.New(), &sdkproto.Resource{
|
||||||
Name: "something",
|
Name: "something",
|
||||||
Type: "aws_instance",
|
Type: "aws_instance",
|
||||||
Agents: []*sdkproto.Agent{{
|
Agents: []*sdkproto.Agent{{
|
||||||
@@ -737,7 +737,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("DuplicateApps", func(t *testing.T) {
|
t.Run("DuplicateApps", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
err := insert(databasefake.New(), uuid.New(), &sdkproto.Resource{
|
err := insert(dbfake.New(), uuid.New(), &sdkproto.Resource{
|
||||||
Name: "something",
|
Name: "something",
|
||||||
Type: "aws_instance",
|
Type: "aws_instance",
|
||||||
Agents: []*sdkproto.Agent{{
|
Agents: []*sdkproto.Agent{{
|
||||||
@@ -752,7 +752,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("Success", func(t *testing.T) {
|
t.Run("Success", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
job := uuid.New()
|
job := uuid.New()
|
||||||
err := insert(db, job, &sdkproto.Resource{
|
err := insert(db, job, &sdkproto.Resource{
|
||||||
Name: "something",
|
Name: "something",
|
||||||
@@ -798,7 +798,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
|
|||||||
|
|
||||||
func setup(t *testing.T, ignoreLogErrors bool) *provisionerdserver.Server {
|
func setup(t *testing.T, ignoreLogErrors bool) *provisionerdserver.Server {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
pubsub := database.NewPubsubInMemory()
|
pubsub := database.NewPubsubInMemory()
|
||||||
|
|
||||||
return &provisionerdserver.Server{
|
return &provisionerdserver.Server{
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import (
|
|||||||
"cdr.dev/slog/sloggers/slogtest"
|
"cdr.dev/slog/sloggers/slogtest"
|
||||||
"github.com/coder/coder/buildinfo"
|
"github.com/coder/coder/buildinfo"
|
||||||
"github.com/coder/coder/coderd/database"
|
"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"
|
"github.com/coder/coder/coderd/telemetry"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ func TestTelemetry(t *testing.T) {
|
|||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
_, err = db.InsertAPIKey(ctx, database.InsertAPIKeyParams{
|
_, err = db.InsertAPIKey(ctx, database.InsertAPIKeyParams{
|
||||||
@@ -132,7 +132,7 @@ func TestTelemetry(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("HashedEmail", func(t *testing.T) {
|
t.Run("HashedEmail", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
_, err := db.InsertUser(context.Background(), database.InsertUserParams{
|
_, err := db.InsertUser(context.Background(), database.InsertUserParams{
|
||||||
ID: uuid.New(),
|
ID: uuid.New(),
|
||||||
Email: "kyle@coder.com",
|
Email: "kyle@coder.com",
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
|
|
||||||
"cdr.dev/slog/sloggers/slogtest"
|
"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/coderd/updatecheck"
|
||||||
"github.com/coder/coder/testutil"
|
"github.com/coder/coder/testutil"
|
||||||
)
|
)
|
||||||
@@ -49,7 +49,7 @@ func TestChecker_Notify(t *testing.T) {
|
|||||||
}))
|
}))
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
|
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Named(t.Name())
|
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Named(t.Name())
|
||||||
notify := make(chan updatecheck.Result, len(wantVersion))
|
notify := make(chan updatecheck.Result, len(wantVersion))
|
||||||
c := updatecheck.New(db, logger, updatecheck.Options{
|
c := updatecheck.New(db, logger, updatecheck.Options{
|
||||||
@@ -131,7 +131,7 @@ func TestChecker_Latest(t *testing.T) {
|
|||||||
}))
|
}))
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
|
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Named(t.Name())
|
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Named(t.Name())
|
||||||
c := updatecheck.New(db, logger, updatecheck.Options{
|
c := updatecheck.New(db, logger, updatecheck.Options{
|
||||||
URL: srv.URL,
|
URL: srv.URL,
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/database/dbgen"
|
||||||
"github.com/coder/coder/testutil"
|
"github.com/coder/coder/testutil"
|
||||||
)
|
)
|
||||||
@@ -30,7 +30,7 @@ func TestAPIKeyEncryption(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("OK", func(t *testing.T) {
|
t.Run("OK", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
keyID, _, hashedSecret, data := generateAPIKey(t, db)
|
keyID, _, hashedSecret, data := generateAPIKey(t, db)
|
||||||
|
|
||||||
encrypted, err := encryptAPIKey(data)
|
encrypted, err := encryptAPIKey(data)
|
||||||
@@ -51,7 +51,7 @@ func TestAPIKeyEncryption(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Expiry", func(t *testing.T) {
|
t.Run("Expiry", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
_, _, _, data := generateAPIKey(t, db)
|
_, _, _, data := generateAPIKey(t, db)
|
||||||
|
|
||||||
data.ExpiresAt = database.Now().Add(-1 * time.Hour)
|
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.Run("KeyMatches", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
|
|
||||||
hashedSecret := sha256.Sum256([]byte("wrong"))
|
hashedSecret := sha256.Sum256([]byte("wrong"))
|
||||||
// Insert a token with a mismatched hashed secret.
|
// Insert a token with a mismatched hashed secret.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database"
|
"github.com/coder/coder/coderd/database"
|
||||||
"github.com/coder/coder/coderd/database/databasefake"
|
"github.com/coder/coder/coderd/database/dbfake"
|
||||||
"github.com/coder/coder/enterprise/audit/audittest"
|
"github.com/coder/coder/enterprise/audit/audittest"
|
||||||
"github.com/coder/coder/enterprise/audit/backends"
|
"github.com/coder/coder/enterprise/audit/backends"
|
||||||
)
|
)
|
||||||
@@ -19,7 +19,7 @@ func TestPostgresBackend(t *testing.T) {
|
|||||||
|
|
||||||
var (
|
var (
|
||||||
ctx, cancel = context.WithCancel(context.Background())
|
ctx, cancel = context.WithCancel(context.Background())
|
||||||
db = databasefake.New()
|
db = dbfake.New()
|
||||||
pgb = backends.NewPostgres(db, true)
|
pgb = backends.NewPostgres(db, true)
|
||||||
alog = audittest.RandomLog()
|
alog = audittest.RandomLog()
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import (
|
|||||||
|
|
||||||
"cdr.dev/slog"
|
"cdr.dev/slog"
|
||||||
"github.com/coder/coder/coderd/database"
|
"github.com/coder/coder/coderd/database"
|
||||||
"github.com/coder/coder/coderd/database/databasefake"
|
"github.com/coder/coder/coderd/database/dbfake"
|
||||||
"github.com/coder/coder/codersdk"
|
"github.com/coder/coder/codersdk"
|
||||||
"github.com/coder/coder/enterprise/coderd/coderdenttest"
|
"github.com/coder/coder/enterprise/coderd/coderdenttest"
|
||||||
"github.com/coder/coder/enterprise/coderd/license"
|
"github.com/coder/coder/enterprise/coderd/license"
|
||||||
@@ -27,7 +27,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("Defaults", func(t *testing.T) {
|
t.Run("Defaults", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
|
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 1, coderdenttest.Keys, all)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.False(t, entitlements.HasLicense)
|
require.False(t, entitlements.HasLicense)
|
||||||
@@ -39,7 +39,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("SingleLicenseNothing", func(t *testing.T) {
|
t.Run("SingleLicenseNothing", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
|
||||||
Exp: time.Now().Add(time.Hour),
|
Exp: time.Now().Add(time.Hour),
|
||||||
@@ -55,7 +55,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("SingleLicenseAll", func(t *testing.T) {
|
t.Run("SingleLicenseAll", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
||||||
Features: func() license.Features {
|
Features: func() license.Features {
|
||||||
@@ -78,7 +78,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("SingleLicenseGrace", func(t *testing.T) {
|
t.Run("SingleLicenseGrace", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
||||||
Features: license.Features{
|
Features: license.Features{
|
||||||
@@ -104,7 +104,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("SingleLicenseNotEntitled", func(t *testing.T) {
|
t.Run("SingleLicenseNotEntitled", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
|
||||||
Exp: time.Now().Add(time.Hour),
|
Exp: time.Now().Add(time.Hour),
|
||||||
@@ -132,7 +132,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("TooManyUsers", func(t *testing.T) {
|
t.Run("TooManyUsers", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertUser(context.Background(), database.InsertUserParams{
|
db.InsertUser(context.Background(), database.InsertUserParams{
|
||||||
Username: "test1",
|
Username: "test1",
|
||||||
LoginType: database.LoginTypePassword,
|
LoginType: database.LoginTypePassword,
|
||||||
@@ -156,7 +156,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("MaximizeUserLimit", func(t *testing.T) {
|
t.Run("MaximizeUserLimit", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertUser(context.Background(), database.InsertUserParams{})
|
db.InsertUser(context.Background(), database.InsertUserParams{})
|
||||||
db.InsertUser(context.Background(), database.InsertUserParams{})
|
db.InsertUser(context.Background(), database.InsertUserParams{})
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
@@ -182,7 +182,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
})
|
})
|
||||||
t.Run("MultipleLicenseEnabled", func(t *testing.T) {
|
t.Run("MultipleLicenseEnabled", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
// One trial
|
// One trial
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
Exp: time.Now().Add(time.Hour),
|
Exp: time.Now().Add(time.Hour),
|
||||||
@@ -206,7 +206,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("AllFeatures", func(t *testing.T) {
|
t.Run("AllFeatures", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
Exp: time.Now().Add(time.Hour),
|
Exp: time.Now().Add(time.Hour),
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
||||||
@@ -228,7 +228,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("MultipleReplicasNoLicense", func(t *testing.T) {
|
t.Run("MultipleReplicasNoLicense", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 2, 1, coderdenttest.Keys, all)
|
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 2, 1, coderdenttest.Keys, all)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.False(t, entitlements.HasLicense)
|
require.False(t, entitlements.HasLicense)
|
||||||
@@ -238,7 +238,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("MultipleReplicasNotEntitled", func(t *testing.T) {
|
t.Run("MultipleReplicasNotEntitled", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
Exp: time.Now().Add(time.Hour),
|
Exp: time.Now().Add(time.Hour),
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
||||||
@@ -258,7 +258,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("MultipleReplicasGrace", func(t *testing.T) {
|
t.Run("MultipleReplicasGrace", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
||||||
Features: license.Features{
|
Features: license.Features{
|
||||||
@@ -280,7 +280,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("MultipleGitAuthNoLicense", func(t *testing.T) {
|
t.Run("MultipleGitAuthNoLicense", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 2, coderdenttest.Keys, all)
|
entitlements, err := license.Entitlements(context.Background(), db, slog.Logger{}, 1, 2, coderdenttest.Keys, all)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.False(t, entitlements.HasLicense)
|
require.False(t, entitlements.HasLicense)
|
||||||
@@ -290,7 +290,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("MultipleGitAuthNotEntitled", func(t *testing.T) {
|
t.Run("MultipleGitAuthNotEntitled", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
Exp: time.Now().Add(time.Hour),
|
Exp: time.Now().Add(time.Hour),
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
||||||
@@ -310,7 +310,7 @@ func TestEntitlements(t *testing.T) {
|
|||||||
|
|
||||||
t.Run("MultipleGitAuthGrace", func(t *testing.T) {
|
t.Run("MultipleGitAuthGrace", func(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
db.InsertLicense(context.Background(), database.InsertLicenseParams{
|
||||||
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{
|
||||||
GraceAt: time.Now().Add(-time.Hour),
|
GraceAt: time.Now().Add(-time.Hour),
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import (
|
|||||||
|
|
||||||
"cdr.dev/slog/sloggers/slogtest"
|
"cdr.dev/slog/sloggers/slogtest"
|
||||||
"github.com/coder/coder/coderd/database"
|
"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/dbtestutil"
|
"github.com/coder/coder/coderd/database/dbtestutil"
|
||||||
"github.com/coder/coder/enterprise/replicasync"
|
"github.com/coder/coder/enterprise/replicasync"
|
||||||
"github.com/coder/coder/testutil"
|
"github.com/coder/coder/testutil"
|
||||||
@@ -187,7 +187,7 @@ func TestReplica(t *testing.T) {
|
|||||||
// This doesn't use the database fake because creating
|
// This doesn't use the database fake because creating
|
||||||
// this many PostgreSQL connections takes some
|
// this many PostgreSQL connections takes some
|
||||||
// configuration tweaking.
|
// configuration tweaking.
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
pubsub := database.NewPubsubInMemory()
|
pubsub := database.NewPubsubInMemory()
|
||||||
logger := slogtest.Make(t, nil)
|
logger := slogtest.Make(t, nil)
|
||||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import (
|
|||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/coder/coder/coderd/database/databasefake"
|
"github.com/coder/coder/coderd/database/dbfake"
|
||||||
"github.com/coder/coder/enterprise/coderd/coderdenttest"
|
"github.com/coder/coder/enterprise/coderd/coderdenttest"
|
||||||
"github.com/coder/coder/enterprise/trialer"
|
"github.com/coder/coder/enterprise/trialer"
|
||||||
)
|
)
|
||||||
@@ -23,7 +23,7 @@ func TestTrialer(t *testing.T) {
|
|||||||
_, _ = w.Write([]byte(license))
|
_, _ = w.Write([]byte(license))
|
||||||
}))
|
}))
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
db := databasefake.New()
|
db := dbfake.New()
|
||||||
|
|
||||||
gen := trialer.New(db, srv.URL, coderdenttest.Keys)
|
gen := trialer.New(db, srv.URL, coderdenttest.Keys)
|
||||||
err := gen(context.Background(), "kyle@coder.com")
|
err := gen(context.Background(), "kyle@coder.com")
|
||||||
|
|||||||
Reference in New Issue
Block a user