Skip to content

Commit cce9f6e

Browse files
spikecurtisspikecurtis
committed
chore: remove New----Builder from dbfake function names
1 parent e8cffce commit cce9f6e

9 files changed

+49
-49
lines changed

‎cli/agent_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestWorkspaceAgent(t *testing.T) {
3131

3232
client, db := coderdtest.NewWithDatabase(t, nil)
3333
user := coderdtest.CreateFirstUser(t, client)
34-
r := dbfake.NewWorkspaceBuilder(t, db).
34+
r := dbfake.Workspace(t, db).
3535
Seed(database.Workspace{
3636
OrganizationID: user.OrganizationID,
3737
OwnerID: user.UserID,
@@ -68,7 +68,7 @@ func TestWorkspaceAgent(t *testing.T) {
6868
AzureCertificates: certificates,
6969
})
7070
user := coderdtest.CreateFirstUser(t, client)
71-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
71+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
7272
OrganizationID: user.OrganizationID,
7373
OwnerID: user.UserID,
7474
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -105,7 +105,7 @@ func TestWorkspaceAgent(t *testing.T) {
105105
AWSCertificates: certificates,
106106
})
107107
user := coderdtest.CreateFirstUser(t, client)
108-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
108+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
109109
OrganizationID: user.OrganizationID,
110110
OwnerID: user.UserID,
111111
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -143,7 +143,7 @@ func TestWorkspaceAgent(t *testing.T) {
143143
})
144144
owner := coderdtest.CreateFirstUser(t, client)
145145
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
146-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
146+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
147147
OrganizationID: owner.OrganizationID,
148148
OwnerID: memberUser.ID,
149149
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -195,7 +195,7 @@ func TestWorkspaceAgent(t *testing.T) {
195195

196196
client, db := coderdtest.NewWithDatabase(t, nil)
197197
user := coderdtest.CreateFirstUser(t, client)
198-
r := dbfake.NewWorkspaceBuilder(t, db).
198+
r := dbfake.Workspace(t, db).
199199
Seed(database.Workspace{
200200
OrganizationID: user.OrganizationID,
201201
OwnerID: user.UserID,

‎cli/configssh_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestConfigSSH(t *testing.T) {
7777
})
7878
owner := coderdtest.CreateFirstUser(t, client)
7979
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
80-
r := dbfake.NewWorkspaceBuilder(t, db).
80+
r := dbfake.Workspace(t, db).
8181
Seed(database.Workspace{
8282
OrganizationID: owner.OrganizationID,
8383
OwnerID: memberUser.ID,
@@ -575,7 +575,7 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
575575
client, db := coderdtest.NewWithDatabase(t, nil)
576576
user := coderdtest.CreateFirstUser(t, client)
577577
if tt.hasAgent {
578-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
578+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
579579
OrganizationID: user.OrganizationID,
580580
OwnerID: user.UserID,
581581
}).WithAgent().Do()
@@ -695,11 +695,11 @@ func TestConfigSSH_Hostnames(t *testing.T) {
695695
owner := coderdtest.CreateFirstUser(t, client)
696696
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
697697

698-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
698+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
699699
OrganizationID: owner.OrganizationID,
700700
OwnerID: memberUser.ID,
701701
}).Do()
702-
dbfake.NewWorkspaceBuildBuilder(t, db, r.Workspace).Resource(resources...).Do()
702+
dbfake.WorkspaceBuild(t, db, r.Workspace).Resource(resources...).Do()
703703
sshConfigFile := sshConfigFileName(t)
704704

705705
inv, root := clitest.New(t, "config-ssh", "--ssh-config-file", sshConfigFile)

‎cli/gitssh_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*agentsdk.Client, str
4848
require.NoError(t, err)
4949

5050
// setup template
51-
r := dbfake.NewWorkspaceBuilder(t, db).
51+
r := dbfake.Workspace(t, db).
5252
Seed(database.Workspace{
5353
OrganizationID: user.OrganizationID,
5454
OwnerID: user.UserID,

‎cli/list_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestList(t *testing.T) {
2525
client, db := coderdtest.NewWithDatabase(t, nil)
2626
owner := coderdtest.CreateFirstUser(t, client)
2727
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
28-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
28+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
2929
OrganizationID: owner.OrganizationID,
3030
OwnerID: memberUser.ID,
3131
}).WithAgent().Do()
@@ -52,7 +52,7 @@ func TestList(t *testing.T) {
5252
client, db := coderdtest.NewWithDatabase(t, nil)
5353
owner := coderdtest.CreateFirstUser(t, client)
5454
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
55-
dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
55+
dbfake.Workspace(t, db).Seed(database.Workspace{
5656
OrganizationID: owner.OrganizationID,
5757
OwnerID: memberUser.ID,
5858
}).WithAgent().Do()

‎cli/portforward_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ func runAgent(t *testing.T, client *codersdk.Client, owner uuid.UUID, db databas
305305
require.NoError(t, err, "specified user does not exist")
306306
require.Greater(t, len(user.OrganizationIDs), 0, "user has no organizations")
307307
orgID := user.OrganizationIDs[0]
308-
r := dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
308+
r := dbfake.Workspace(t, db).Seed(database.Workspace{
309309
OrganizationID: orgID,
310310
OwnerID: owner,
311311
}).WithAgent().Do()

‎cli/schedule_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ func setupTestSchedule(t *testing.T, sched *cron.Schedule) (ownerClient, memberC
3838
memberClient, memberUser := coderdtest.CreateAnotherUserMutators(t, ownerClient, owner.OrganizationID, nil, func(r *codersdk.CreateUserRequest) {
3939
r.Username = "testuser2" // ensure deterministic ordering
4040
})
41-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
41+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
4242
Name: "a-owner",
4343
OwnerID: owner.UserID,
4444
OrganizationID: owner.OrganizationID,
4545
AutostartSchedule: sql.NullString{String: sched.String(), Valid: true},
4646
Ttl: sql.NullInt64{Int64: 8 * time.Hour.Nanoseconds(), Valid: true},
4747
}).WithAgent().Do()
48-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
48+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
4949
Name: "b-owner",
5050
OwnerID: owner.UserID,
5151
OrganizationID: owner.OrganizationID,
5252
AutostartSchedule: sql.NullString{String: sched.String(), Valid: true},
5353
}).WithAgent().Do()
54-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
54+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
5555
Name: "c-member",
5656
OwnerID: memberUser.ID,
5757
OrganizationID: owner.OrganizationID,
5858
Ttl: sql.NullInt64{Int64: 8 * time.Hour.Nanoseconds(), Valid: true},
5959
}).WithAgent().Do()
60-
_ = dbfake.NewWorkspaceBuilder(t, db).Seed(database.Workspace{
60+
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
6161
Name: "d-member",
6262
OwnerID: memberUser.ID,
6363
OrganizationID: owner.OrganizationID,

‎cli/ssh_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func setupWorkspaceForAgent(t *testing.T, mutations ...func([]*proto.Agent) []*p
5252
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
5353
first := coderdtest.CreateFirstUser(t, client)
5454
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
55-
r := dbfake.NewWorkspaceBuilder(t, store).
55+
r := dbfake.Workspace(t, store).
5656
Seed(database.Workspace{
5757
OrganizationID: first.OrganizationID,
5858
OwnerID: user.ID,
@@ -130,7 +130,7 @@ func TestSSH(t *testing.T) {
130130
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
131131
first := coderdtest.CreateFirstUser(t, client)
132132
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
133-
r := dbfake.NewWorkspaceBuilder(t, store).Seed(database.Workspace{
133+
r := dbfake.Workspace(t, store).Seed(database.Workspace{
134134
OrganizationID: first.OrganizationID,
135135
OwnerID: user.ID,
136136
}).WithAgent().Do()
@@ -154,7 +154,7 @@ func TestSSH(t *testing.T) {
154154
pty.WriteLine("echo hell'o'")
155155
pty.ExpectMatchContext(ctx, "hello")
156156

157-
_ = dbfake.NewWorkspaceBuildBuilder(t, store, r.Workspace).
157+
_ = dbfake.WorkspaceBuild(t, store, r.Workspace).
158158
Seed(database.WorkspaceBuild{
159159
Transition: database.WorkspaceTransitionStop,
160160
BuildNumber: 2,
@@ -469,7 +469,7 @@ func TestSSH(t *testing.T) {
469469
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
470470
first := coderdtest.CreateFirstUser(t, client)
471471
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
472-
r := dbfake.NewWorkspaceBuilder(t, store).Seed(database.Workspace{
472+
r := dbfake.Workspace(t, store).Seed(database.Workspace{
473473
OrganizationID: first.OrganizationID,
474474
OwnerID: user.ID,
475475
}).WithAgent().Do()
@@ -523,7 +523,7 @@ func TestSSH(t *testing.T) {
523523
err = session.Shell()
524524
require.NoError(t, err)
525525

526-
_ = dbfake.NewWorkspaceBuildBuilder(t, store, r.Workspace).
526+
_ = dbfake.WorkspaceBuild(t, store, r.Workspace).
527527
Seed(database.WorkspaceBuild{
528528
Transition: database.WorkspaceTransitionStop,
529529
BuildNumber: 2,

‎coderd/database/dbfake/dbfake.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type WorkspaceResponse struct {
3636
AgentToken string
3737
}
3838

39-
func NewWorkspaceBuilder(t testing.TB, db database.Store) WorkspaceBuilder {
39+
func Workspace(t testing.TB, db database.Store) WorkspaceBuilder {
4040
return WorkspaceBuilder{t: t, db: db}
4141
}
4242

@@ -82,7 +82,7 @@ func (b WorkspaceBuilder) Do() WorkspaceResponse {
8282
r.Workspace = dbgen.Workspace(b.t, b.db, b.seed)
8383
if b.agentToken != "" {
8484
r.AgentToken = b.agentToken
85-
r.Build = NewWorkspaceBuildBuilder(b.t, b.db, r.Workspace).
85+
r.Build = WorkspaceBuild(b.t, b.db, r.Workspace).
8686
Resource(b.resources...).
8787
Do()
8888
}
@@ -98,7 +98,7 @@ type WorkspaceBuildBuilder struct {
9898
resources []*sdkproto.Resource
9999
}
100100

101-
func NewWorkspaceBuildBuilder(t testing.TB, db database.Store, ws database.Workspace) WorkspaceBuildBuilder {
101+
func WorkspaceBuild(t testing.TB, db database.Store, ws database.Workspace) WorkspaceBuildBuilder {
102102
return WorkspaceBuildBuilder{t: t, db: db, ws: ws}
103103
}
104104

@@ -187,11 +187,11 @@ func (b WorkspaceBuildBuilder) Do() database.WorkspaceBuild {
187187
Valid: true,
188188
},
189189
})
190-
NewProvisionerJobResourcesBuilder(b.t, b.db, jobID, b.seed.Transition, b.resources...).Do()
190+
ProvisionerJobResources(b.t, b.db, jobID, b.seed.Transition, b.resources...).Do()
191191
b.seed.TemplateVersionID = templateVersion.ID
192192
}
193193
build := dbgen.WorkspaceBuild(b.t, b.db, b.seed)
194-
NewProvisionerJobResourcesBuilder(b.t, b.db, job.ID, b.seed.Transition, b.resources...).Do()
194+
ProvisionerJobResources(b.t, b.db, job.ID, b.seed.Transition, b.resources...).Do()
195195
if b.ps != nil {
196196
err = b.ps.Publish(codersdk.WorkspaceNotifyChannel(build.WorkspaceID), []byte{})
197197
require.NoError(b.t, err)
@@ -207,8 +207,8 @@ type ProvisionerJobResourcesBuilder struct {
207207
resources []*sdkproto.Resource
208208
}
209209

210-
// NewProvisionerJobResourcesBuilder inserts a series of resources into a provisioner job.
211-
func NewProvisionerJobResourcesBuilder(
210+
// ProvisionerJobResources inserts a series of resources into a provisioner job.
211+
func ProvisionerJobResources(
212212
t testing.TB, db database.Store, jobID uuid.UUID, transition database.WorkspaceTransition, resources ...*sdkproto.Resource,
213213
) ProvisionerJobResourcesBuilder {
214214
return ProvisionerJobResourcesBuilder{

0 commit comments

Comments
 (0)