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: remove New----Builder from dbfake function names (#10882)

Browse Source 
Drop "New" and "Builder" from the function names, in favor of the top-level resource created.  This shortens tests and gives a nice syntax.  Since everything is a builder, the prefix and suffix don't add much value and just make things harder to read.

I've also chosen to leave `Do()` as the function to insert into the database.  Even though it's a builder pattern, I fear `.Build()` might be confusing with Workspace Builds.  One other idea is `Insert()` but if we later add dbfake functions that update, this might be inconsistent.
This commit is contained in:
Spike Curtis
2023-11-29 11:06:04 +04:00
committed by GitHub
parent 48d69c9e60
commit 2dc565d5de
9 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/database/dbfake/dbfake.go
+7 -7
View File
@@ -36,7 +36,7 @@ type WorkspaceResponse struct {
AgentToken string
}
func NewWorkspaceBuilder(t testing.TB, db database.Store) WorkspaceBuilder {
func Workspace(t testing.TB, db database.Store) WorkspaceBuilder {
return WorkspaceBuilder{t: t, db: db}
}
@@ -82,7 +82,7 @@ func (b WorkspaceBuilder) Do() WorkspaceResponse {
r.Workspace = dbgen.Workspace(b.t, b.db, b.seed)
if b.agentToken != "" {
r.AgentToken = b.agentToken
r.Build = NewWorkspaceBuildBuilder(b.t, b.db, r.Workspace).
r.Build = WorkspaceBuild(b.t, b.db, r.Workspace).
Resource(b.resources...).
Do()
}
@@ -98,7 +98,7 @@ type WorkspaceBuildBuilder struct {
resources []*sdkproto.Resource
}
func NewWorkspaceBuildBuilder(t testing.TB, db database.Store, ws database.Workspace) WorkspaceBuildBuilder {
func WorkspaceBuild(t testing.TB, db database.Store, ws database.Workspace) WorkspaceBuildBuilder {
return WorkspaceBuildBuilder{t: t, db: db, ws: ws}
}
@@ -187,11 +187,11 @@ func (b WorkspaceBuildBuilder) Do() database.WorkspaceBuild {
Valid: true,
},
})
NewProvisionerJobResourcesBuilder(b.t, b.db, jobID, b.seed.Transition, b.resources...).Do()
ProvisionerJobResources(b.t, b.db, jobID, b.seed.Transition, b.resources...).Do()
b.seed.TemplateVersionID = templateVersion.ID
}
build := dbgen.WorkspaceBuild(b.t, b.db, b.seed)
NewProvisionerJobResourcesBuilder(b.t, b.db, job.ID, b.seed.Transition, b.resources...).Do()
ProvisionerJobResources(b.t, b.db, job.ID, b.seed.Transition, b.resources...).Do()
if b.ps != nil {
err = b.ps.Publish(codersdk.WorkspaceNotifyChannel(build.WorkspaceID), []byte{})
require.NoError(b.t, err)
@@ -207,8 +207,8 @@ type ProvisionerJobResourcesBuilder struct {
resources []*sdkproto.Resource
}
// NewProvisionerJobResourcesBuilder inserts a series of resources into a provisioner job.
func NewProvisionerJobResourcesBuilder(
// ProvisionerJobResources inserts a series of resources into a provisioner job.
func ProvisionerJobResources(
t testing.TB, db database.Store, jobID uuid.UUID, transition database.WorkspaceTransition, resources ...*sdkproto.Resource,
) ProvisionerJobResourcesBuilder {
return ProvisionerJobResourcesBuilder{