Skip to content

Commit 3c03843

Browse files
EmyrkEmyrk
committed
fix dgen calls
1 parent dc5189c commit 3c03843

23 files changed

+113
-122
lines changed

‎cli/configssh_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func TestConfigSSH(t *testing.T) {
7878
})
7979
owner := coderdtest.CreateFirstUser(t, client)
8080
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
81-
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
81+
r := dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
8282
OrganizationID: owner.OrganizationID,
8383
OwnerID: memberUser.ID,
8484
}).WithAgent().Do()
@@ -642,7 +642,7 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
642642
client, db := coderdtest.NewWithDatabase(t, nil)
643643
user := coderdtest.CreateFirstUser(t, client)
644644
if tt.hasAgent {
645-
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{
645+
_ = dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
646646
OrganizationID: user.OrganizationID,
647647
OwnerID: user.UserID,
648648
}).WithAgent().Do()
@@ -762,7 +762,7 @@ func TestConfigSSH_Hostnames(t *testing.T) {
762762
owner := coderdtest.CreateFirstUser(t, client)
763763
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
764764

765-
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
765+
r := dbfake.WorkspaceBuild(t, db, database.WorkspaceTable{
766766
OrganizationID: owner.OrganizationID,
767767
OwnerID: memberUser.ID,
768768
}).Resource(resources...).Do()

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 67 additions & 67 deletions
Large diffs are not rendered by default.

‎coderd/database/dbgen/dbgen_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ func TestGenerator(t *testing.T) {
128128
t.Run("Workspace", func(t *testing.T) {
129129
t.Parallel()
130130
db := dbmem.New()
131-
exp := dbgen.Workspace(t, db, database.Workspace{})
132-
require.Equal(t, exp, must(db.GetWorkspaceByID(context.Background(), exp.ID)))
131+
exp := dbgen.Workspace(t, db, database.WorkspaceTable{})
132+
require.Equal(t, exp, must(db.GetWorkspaceByID(context.Background(), exp.ID)).WorkspaceTable())
133133
})
134134

135135
t.Run("WorkspaceAgent", func(t *testing.T) {

‎coderd/database/dbpurge/dbpurge_test.go

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

196196
// Workspace A was built twice before the threshold, and never connected on
197197
// either attempt.
198-
wsA := dbgen.Workspace(t, db, database.Workspace{Name: "a", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
198+
wsA := dbgen.Workspace(t, db, database.WorkspaceTable{Name: "a", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
199199
wbA1 := mustCreateWorkspaceBuild(t, db, org, tv, wsA.ID, beforeThreshold, 1)
200200
wbA2 := mustCreateWorkspaceBuild(t, db, org, tv, wsA.ID, beforeThreshold, 2)
201201
agentA1 := mustCreateAgent(t, db, wbA1)
@@ -204,7 +204,7 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
204204
mustCreateAgentLogs(ctx, t, db, agentA2, nil, "agent a2 logs should be retained")
205205

206206
// Workspace B was built twice before the threshold.
207-
wsB := dbgen.Workspace(t, db, database.Workspace{Name: "b", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
207+
wsB := dbgen.Workspace(t, db, database.WorkspaceTable{Name: "b", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
208208
wbB1 := mustCreateWorkspaceBuild(t, db, org, tv, wsB.ID, beforeThreshold, 1)
209209
wbB2 := mustCreateWorkspaceBuild(t, db, org, tv, wsB.ID, beforeThreshold, 2)
210210
agentB1 := mustCreateAgent(t, db, wbB1)
@@ -213,7 +213,7 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
213213
mustCreateAgentLogs(ctx, t, db, agentB2, &beforeThreshold, "agent b2 logs should be retained")
214214

215215
// Workspace C was built once before the threshold, and once after.
216-
wsC := dbgen.Workspace(t, db, database.Workspace{Name: "c", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
216+
wsC := dbgen.Workspace(t, db, database.WorkspaceTable{Name: "c", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
217217
wbC1 := mustCreateWorkspaceBuild(t, db, org, tv, wsC.ID, beforeThreshold, 1)
218218
wbC2 := mustCreateWorkspaceBuild(t, db, org, tv, wsC.ID, afterThreshold, 2)
219219
agentC1 := mustCreateAgent(t, db, wbC1)
@@ -222,7 +222,7 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
222222
mustCreateAgentLogs(ctx, t, db, agentC2, &afterThreshold, "agent c2 logs should be retained")
223223

224224
// Workspace D was built twice after the threshold.
225-
wsD := dbgen.Workspace(t, db, database.Workspace{Name: "d", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
225+
wsD := dbgen.Workspace(t, db, database.WorkspaceTable{Name: "d", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
226226
wbD1 := mustCreateWorkspaceBuild(t, db, org, tv, wsD.ID, afterThreshold, 1)
227227
wbD2 := mustCreateWorkspaceBuild(t, db, org, tv, wsD.ID, afterThreshold, 2)
228228
agentD1 := mustCreateAgent(t, db, wbD1)
@@ -231,7 +231,7 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
231231
mustCreateAgentLogs(ctx, t, db, agentD2, &afterThreshold, "agent d2 logs should be retained")
232232

233233
// Workspace E was build once after threshold but never connected.
234-
wsE := dbgen.Workspace(t, db, database.Workspace{Name: "e", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
234+
wsE := dbgen.Workspace(t, db, database.WorkspaceTable{Name: "e", OwnerID: user.ID, OrganizationID: org.ID, TemplateID: tmpl.ID})
235235
wbE1 := mustCreateWorkspaceBuild(t, db, org, tv, wsE.ID, beforeThreshold, 1)
236236
agentE1 := mustCreateAgent(t, db, wbE1)
237237
mustCreateAgentLogs(ctx, t, db, agentE1, nil, "agent e1 logs should be retained")

‎coderd/database/dbrollup/dbrollup_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestRollup_TwoInstancesUseLocking(t *testing.T) {
6464
user = dbgen.User(t, db, database.User{Name: "user1"})
6565
tpl = dbgen.Template(t, db, database.Template{OrganizationID: org.ID, CreatedBy: user.ID})
6666
ver = dbgen.TemplateVersion(t, db, database.TemplateVersion{OrganizationID: org.ID, TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true}, CreatedBy: user.ID})
67-
ws = dbgen.Workspace(t, db, database.Workspace{OrganizationID: org.ID, TemplateID: tpl.ID, OwnerID: user.ID})
67+
ws = dbgen.Workspace(t, db, database.WorkspaceTable{OrganizationID: org.ID, TemplateID: tpl.ID, OwnerID: user.ID})
6868
job = dbgen.ProvisionerJob(t, db, ps, database.ProvisionerJob{OrganizationID: org.ID})
6969
build = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: job.ID, TemplateVersionID: ver.ID})
7070
res = dbgen.WorkspaceResource(t, db, database.WorkspaceResource{JobID: build.JobID})
@@ -151,7 +151,7 @@ func TestRollupTemplateUsageStats(t *testing.T) {
151151
user = dbgen.User(t, db, database.User{Name: "user1"})
152152
tpl = dbgen.Template(t, db, database.Template{OrganizationID: org.ID, CreatedBy: user.ID})
153153
ver = dbgen.TemplateVersion(t, db, database.TemplateVersion{OrganizationID: org.ID, TemplateID: uuid.NullUUID{UUID: tpl.ID, Valid: true}, CreatedBy: user.ID})
154-
ws = dbgen.Workspace(t, db, database.Workspace{OrganizationID: org.ID, TemplateID: tpl.ID, OwnerID: user.ID})
154+
ws = dbgen.Workspace(t, db, database.WorkspaceTable{OrganizationID: org.ID, TemplateID: tpl.ID, OwnerID: user.ID})
155155
job = dbgen.ProvisionerJob(t, db, ps, database.ProvisionerJob{OrganizationID: org.ID})
156156
build = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: ws.ID, JobID: job.ID, TemplateVersionID: ver.ID})
157157
res = dbgen.WorkspaceResource(t, db, database.WorkspaceResource{JobID: build.JobID})

‎coderd/httpmw/workspaceagent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func setup(t testing.TB, db database.Store, authToken uuid.UUID, mw func(http.Ha
116116
ActiveVersionID: templateVersion.ID,
117117
CreatedBy: user.ID,
118118
})
119-
workspace := dbgen.Workspace(t, db, database.Workspace{
119+
workspace := dbgen.Workspace(t, db, database.WorkspaceTable{
120120
OwnerID: user.ID,
121121
OrganizationID: org.ID,
122122
TemplateID: template.ID,

‎coderd/httpmw/workspaceagentparam_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestWorkspaceAgentParam(t *testing.T) {
3131
UserID: user.ID,
3232
})
3333
tpl = dbgen.Template(t, db, database.Template{})
34-
workspace = dbgen.Workspace(t, db, database.Workspace{
34+
workspace = dbgen.Workspace(t, db, database.WorkspaceTable{
3535
OwnerID: user.ID,
3636
TemplateID: tpl.ID,
3737
})

‎coderd/httpmw/workspacebuildparam_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestWorkspaceBuildParam(t *testing.T) {
2626
_, token = dbgen.APIKey(t, db, database.APIKey{
2727
UserID: user.ID,
2828
})
29-
workspace = dbgen.Workspace(t, db, database.Workspace{
29+
workspace = dbgen.Workspace(t, db, database.WorkspaceTable{
3030
OwnerID: user.ID,
3131
})
3232
)

‎coderd/httpmw/workspaceparam_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ func setupWorkspaceWithAgents(t testing.TB, cfg setupConfig) (database.Store, *h
355355
_, token = dbgen.APIKey(t, db, database.APIKey{
356356
UserID: user.ID,
357357
})
358-
workspace = dbgen.Workspace(t, db, database.Workspace{
358+
workspace = dbgen.Workspace(t, db, database.WorkspaceTable{
359359
OwnerID: user.ID,
360360
Name: cfg.WorkspaceName,
361361
})

‎coderd/notifications/reports/generator_internal_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
9090
t1v1 := dbgen.TemplateVersion(t, db, database.TemplateVersion{Name: "template-1-version-1", CreatedBy: templateAdmin1.ID, OrganizationID: org.ID, TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true}, JobID: uuid.New()})
9191

9292
// Workspaces
93-
w1 := dbgen.Workspace(t, db, database.Workspace{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
93+
w1 := dbgen.Workspace(t, db, database.WorkspaceTable{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
9494

9595
w1wb1pj := dbgen.ProvisionerJob(t, db, ps, database.ProvisionerJob{OrganizationID: org.ID, Error: jobError, ErrorCode: jobErrorCode, CompletedAt: sql.NullTime{Time: now.Add(-6 * dayDuration), Valid: true}})
9696
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: w1.ID, BuildNumber: 1, TemplateVersionID: t1v1.ID, JobID: w1wb1pj.ID, CreatedAt: now.Add(-2 * dayDuration), Transition: database.WorkspaceTransitionStart, Reason: database.BuildReasonInitiator})
@@ -164,10 +164,10 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
164164
t2v2 := dbgen.TemplateVersion(t, db, database.TemplateVersion{Name: "template-2-version-2", CreatedBy: templateAdmin1.ID, OrganizationID: org.ID, TemplateID: uuid.NullUUID{UUID: t2.ID, Valid: true}, JobID: uuid.New()})
165165

166166
// Workspaces
167-
w1 := dbgen.Workspace(t, db, database.Workspace{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
168-
w2 := dbgen.Workspace(t, db, database.Workspace{TemplateID: t2.ID, OwnerID: user2.ID, OrganizationID: org.ID})
169-
w3 := dbgen.Workspace(t, db, database.Workspace{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
170-
w4 := dbgen.Workspace(t, db, database.Workspace{TemplateID: t2.ID, OwnerID: user2.ID, OrganizationID: org.ID})
167+
w1 := dbgen.Workspace(t, db, database.WorkspaceTable{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
168+
w2 := dbgen.Workspace(t, db, database.WorkspaceTable{TemplateID: t2.ID, OwnerID: user2.ID, OrganizationID: org.ID})
169+
w3 := dbgen.Workspace(t, db, database.WorkspaceTable{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
170+
w4 := dbgen.Workspace(t, db, database.WorkspaceTable{TemplateID: t2.ID, OwnerID: user2.ID, OrganizationID: org.ID})
171171

172172
// When: first run
173173
notifEnq.Clear()
@@ -330,7 +330,7 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
330330
t1v2 := dbgen.TemplateVersion(t, db, database.TemplateVersion{Name: "template-1-version-2", CreatedBy: templateAdmin1.ID, OrganizationID: org.ID, TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true}, JobID: uuid.New()})
331331

332332
// Workspaces
333-
w1 := dbgen.Workspace(t, db, database.Workspace{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
333+
w1 := dbgen.Workspace(t, db, database.WorkspaceTable{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
334334

335335
// When: first run
336336
notifEnq.Clear()
@@ -427,7 +427,7 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
427427
t1v1 := dbgen.TemplateVersion(t, db, database.TemplateVersion{Name: "template-1-version-1", CreatedBy: templateAdmin1.ID, OrganizationID: org.ID, TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true}, JobID: uuid.New()})
428428

429429
// Workspaces
430-
w1 := dbgen.Workspace(t, db, database.Workspace{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
430+
w1 := dbgen.Workspace(t, db, database.WorkspaceTable{TemplateID: t1.ID, OwnerID: user1.ID, OrganizationID: org.ID})
431431

432432
// When: first run
433433
notifEnq.Clear()

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy