From bd9cf1256e9ad836b7c6f757764565d5d4762539 Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Mon, 27 Nov 2023 11:19:25 +0400 Subject: [PATCH] chore: add Resources() to dbfake.WorkspaceBuilder --- cli/configssh_test.go | 11 ++++++----- coderd/database/dbfake/dbfake.go | 8 ++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/cli/configssh_test.go b/cli/configssh_test.go index 704c74113e14e..13e00c8fb9e9b 100644 --- a/cli/configssh_test.go +++ b/cli/configssh_test.go @@ -695,11 +695,12 @@ func TestConfigSSH_Hostnames(t *testing.T) { owner := coderdtest.CreateFirstUser(t, client) member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID) - r := dbfake.Workspace(t, db).Seed(database.Workspace{ - OrganizationID: owner.OrganizationID, - OwnerID: memberUser.ID, - }).Do() - dbfake.WorkspaceBuild(t, db, r.Workspace).Resource(resources...).Do() + r := dbfake.Workspace(t, db). + Seed(database.Workspace{ + OrganizationID: owner.OrganizationID, + OwnerID: memberUser.ID, + }). + Resource(resources...).Do() sshConfigFile := sshConfigFileName(t) inv, root := clitest.New(t, "config-ssh", "--ssh-config-file", sshConfigFile) diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go index 25f0860b4f120..a340d8f904166 100644 --- a/coderd/database/dbfake/dbfake.go +++ b/coderd/database/dbfake/dbfake.go @@ -66,6 +66,12 @@ func (b WorkspaceBuilder) WithAgent(mutations ...func([]*sdkproto.Agent) []*sdkp return b } +func (b WorkspaceBuilder) Resource(resource ...*sdkproto.Resource) WorkspaceBuilder { + //nolint: revive // returns modified struct + b.resources = append(b.resources, resource...) + return b +} + func (b WorkspaceBuilder) Do() WorkspaceResponse { var r WorkspaceResponse // This intentionally fulfills the minimum requirements of the schema. @@ -82,6 +88,8 @@ func (b WorkspaceBuilder) Do() WorkspaceResponse { r.Workspace = dbgen.Workspace(b.t, b.db, b.seed) if b.agentToken != "" { r.AgentToken = b.agentToken + } + if len(b.resources) > 0 { r.Build = WorkspaceBuild(b.t, b.db, r.Workspace). Resource(b.resources...). Do()