Skip to content

Commit 2cb8562

Browse files
committed
chore: add Resources() to dbfake.WorkspaceBuilder
1 parent d270a5e commit 2cb8562

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

cli/configssh_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -695,11 +695,12 @@ 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.Workspace(t, db).Seed(database.Workspace{
699-
OrganizationID: owner.OrganizationID,
700-
OwnerID: memberUser.ID,
701-
}).Do()
702-
dbfake.WorkspaceBuild(t, db, r.Workspace).Resource(resources...).Do()
698+
r := dbfake.Workspace(t, db).
699+
Seed(database.Workspace{
700+
OrganizationID: owner.OrganizationID,
701+
OwnerID: memberUser.ID,
702+
}).
703+
Resource(resources...).Do()
703704
sshConfigFile := sshConfigFileName(t)
704705

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

coderd/database/dbfake/dbfake.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ func (b WorkspaceBuilder) WithAgent(mutations ...func([]*sdkproto.Agent) []*sdkp
6666
return b
6767
}
6868

69+
func (b WorkspaceBuilder) Resource(resource ...*sdkproto.Resource) WorkspaceBuilder {
70+
//nolint: revive // returns modified struct
71+
b.resources = append(b.resources, resource...)
72+
return b
73+
}
74+
6975
func (b WorkspaceBuilder) Do() WorkspaceResponse {
7076
var r WorkspaceResponse
7177
// This intentionally fulfills the minimum requirements of the schema.
@@ -82,6 +88,8 @@ func (b WorkspaceBuilder) Do() WorkspaceResponse {
8288
r.Workspace = dbgen.Workspace(b.t, b.db, b.seed)
8389
if b.agentToken != "" {
8490
r.AgentToken = b.agentToken
91+
}
92+
if len(b.resources) > 0 {
8593
r.Build = WorkspaceBuild(b.t, b.db, r.Workspace).
8694
Resource(b.resources...).
8795
Do()

0 commit comments

Comments
 (0)