synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove dbfake.WorkspaceBuild in favor of builder pattern (#10814)

Browse Source 
I'd like to convert dbfake into a builder pattern to prevent a proliferation of XXXWithYYY methods.  This is one step of the way by removing the Non-builder function.
This commit is contained in:
Spike Curtis
2023-11-22 13:04:58 +04:00
committed by GitHub
parent b73d9d788b
commit b25e5dc90b
5 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
coderd/workspaceagents_test.go
View File

@ -50,13 +50,13 @@ func TestWorkspaceAgent(t *testing.T) {
OrganizationID: user.OrganizationID,
OwnerID: anotherUser.ID,
})
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Name: "aws_instance",
Agents: []*proto.Agent{{
Id: uuid.NewString(),
Directory: tmpDir,
}},
})
}).Do()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
workspace, err := anotherClient.Workspace(ctx, ws.ID)
@ -75,13 +75,13 @@ func TestWorkspaceAgent(t *testing.T) {
OrganizationID: user.OrganizationID,
OwnerID: user.UserID,
})
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Name: "aws_instance",
Agents: []*proto.Agent{{
Id: uuid.NewString(),
Directory: tmpDir,
}},
})
}).Do()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
defer cancel()
@ -107,7 +107,7 @@ func TestWorkspaceAgent(t *testing.T) {
OwnerID: user.UserID,
OrganizationID: user.OrganizationID,
})
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Name: "example",
Type: "aws_instance",
Agents: []*proto.Agent{{
@ -119,7 +119,7 @@ func TestWorkspaceAgent(t *testing.T) {
ConnectionTimeoutSeconds: 1,
TroubleshootingUrl: wantTroubleshootingURL,
}},
})
}).Do()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
defer cancel()
@ -156,7 +156,7 @@ func TestWorkspaceAgent(t *testing.T) {
PortForwardingHelper: true,
SshHelper: true,
}
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Agents: []*proto.Agent{
{
Directory: tmpDir,
@ -166,7 +166,7 @@ func TestWorkspaceAgent(t *testing.T) {
DisplayApps: apps,
},
},
})
}).Do()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
@ -196,7 +196,7 @@ func TestWorkspaceAgent(t *testing.T) {
OrganizationID: user.OrganizationID,
OwnerID: user.UserID,
})
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Agents: []*proto.Agent{
{
Directory: tmpDir,
@ -206,7 +206,7 @@ func TestWorkspaceAgent(t *testing.T) {
DisplayApps: apps,
},
},
})
}).Do()
workspace, err = client.Workspace(ctx, ws.ID)
require.NoError(t, err)
@ -543,14 +543,14 @@ func TestWorkspaceAgentListeningPorts(t *testing.T) {
OwnerID: user.UserID,
})
authToken := uuid.NewString()
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Agents: []*proto.Agent{{
Apps: apps,
Auth: &proto.Agent_Token{
Token: authToken,
},
}},
})
}).Do()
_ = agenttest.New(t, client.URL, authToken)
resources := coderdtest.AwaitWorkspaceAgents(t, client, ws.ID)
return client, uint16(coderdPort), resources[0].Agents[0].ID
@ -776,7 +776,7 @@ func TestWorkspaceAgentAppHealth(t *testing.T) {
OrganizationID: user.OrganizationID,
OwnerID: user.UserID,
})
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Name: "example",
Type: "aws_instance",
Agents: []*proto.Agent{{
@ -786,7 +786,7 @@ func TestWorkspaceAgentAppHealth(t *testing.T) {
},
Apps: apps,
}},
})
}).Do()
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
@ -984,7 +984,7 @@ func TestWorkspaceAgent_Metadata(t *testing.T) {
OrganizationID: user.OrganizationID,
OwnerID: user.UserID,
})
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Name: "example",
Type: "aws_instance",
Agents: []*proto.Agent{{
@ -1016,7 +1016,7 @@ func TestWorkspaceAgent_Metadata(t *testing.T) {
Token: authToken,
},
}},
})
}).Do()
workspace, err := client.Workspace(context.Background(), ws.ID)
require.NoError(t, err)
for _, res := range workspace.LatestBuild.Resources {
@ -1167,7 +1167,7 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) {
OrganizationID: user.OrganizationID,
OwnerID: user.UserID,
})
dbfake.WorkspaceBuild(t, db, ws, database.WorkspaceBuild{}, &proto.Resource{
dbfake.NewWorkspaceBuildBuilder(t, db, ws).Resource(&proto.Resource{
Name: "example",
Type: "aws_instance",
Agents: []*proto.Agent{{
@ -1192,7 +1192,7 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) {
Token: authToken,
},
}},
})
}).Do()
workspace, err := client.Workspace(context.Background(), ws.ID)
require.NoError(t, err)
for _, res := range workspace.LatestBuild.Resources {