chore: use dbfake for ssh tests rather than provisionerd #10812
Conversation
|
Current dependencies on/for this PR:
This stack of pull requests is managed by Graphite. |
2a1290d to
093c1cd
Compare
| type BuildBuilder struct { | ||
| t testing.TB | ||
| db database.Store | ||
| ps pubsub.Pubsub | ||
| ws database.Workspace | ||
| seed database.WorkspaceBuild | ||
| resources []*sdkproto.Resource | ||
| } | ||
|
|
||
| func WorkspaceBuildBuilder(t testing.TB, db database.Store, ws database.Workspace) BuildBuilder { | ||
| return BuildBuilder{t: t, db: db, ws: ws} | ||
| } |
There was a problem hiding this comment.
Naming suggestion
BuildBuilder sounds confusing, and may suggest that it creates a generic build that includes workspace build.
Maybe NewWorkspaceBuildBuilder(<required params>) and keep WorkspaceBuildBuilder as struct? It could be also a separate package dbbuilders if dbfake starts growing.
There was a problem hiding this comment.
I'd eventually like to make all of dbfake based on the builder pattern, and drop Builder and New from the public function names, but in the interim, we can go with the more-wordy NewXxxxxxBuilder() as the convention.
| seed.ID = uuid.New() | ||
| seed.JobID = jobID | ||
| seed.WorkspaceID = ws.ID | ||
| b.seed.ID = uuid.New() |
There was a problem hiding this comment.
it's optional. Much of the code that this replaces just passes a zero value for the seed, which is equivalent to not calling Seed()
| workspace, agentToken := dbfake.WorkspaceWithAgent(t, store, database.Workspace{ | ||
| OrganizationID: first.OrganizationID, | ||
| OwnerID: user.ID, | ||
| }) |
There was a problem hiding this comment.
Unless I'm making the wrong assumption for this change/code, maybe setupWorkspaceForAgent could return a struct instead, with store/ps so we could avoid needing this ceremony when we require those. Just a thought.
There was a problem hiding this comment.
We could. I decided not to since there are only two places that require it right now.
Refactors SSH tests to skip provisionerd and instead use dbfake to insert workspaces and builds. This should make tests faster and more reliable.
dbfake.WorkspaceBuild is refactored to use a "builder" pattern with "fluent" options, as the number of options and variants was starting to get out of hand.