@@ -4392,15 +4392,15 @@ func (s *MethodTestSuite) TestSystemFunctions() {
4392
4392
check .Args (arg ).Asserts (rbac .ResourceSystem ,policy .ActionCreate )
4393
4393
}))
4394
4394
s .Run ("GetProvisionerJobTimingsByJobID" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
4395
- j := testutil .Fake (s .T (),faker , database.ProvisionerJob {Type :database .ProvisionerJobTypeWorkspaceBuild })
4396
- b := testutil .Fake (s .T (),faker , database.WorkspaceBuild {JobID :j .ID })
4397
- ws := testutil .Fake (s .T (),faker , database.Workspace {ID :b .WorkspaceID })
4398
- dbm .EXPECT ().GetProvisionerJobByID (gomock .Any (),j .ID ).Return (j ,nil ).AnyTimes ()
4399
- dbm .EXPECT ().GetWorkspaceBuildByJobID (gomock .Any (),j .ID ).Return (b ,nil ).AnyTimes ()
4400
- dbm .EXPECT ().GetWorkspaceByID (gomock .Any (),b .WorkspaceID ).Return (ws ,nil ).AnyTimes ()
4401
- dbm .EXPECT ().GetProvisionerJobTimingsByJobID (gomock .Any (),j .ID ).Return ([]database.ProvisionerJobTiming {},nil ).AnyTimes ()
4402
- check .Args (j .ID ).Asserts (ws ,policy .ActionRead )
4403
- }))
4395
+ j := testutil .Fake (s .T (),faker , database.ProvisionerJob {Type :database .ProvisionerJobTypeWorkspaceBuild })
4396
+ b := testutil .Fake (s .T (),faker , database.WorkspaceBuild {JobID :j .ID })
4397
+ ws := testutil .Fake (s .T (),faker , database.Workspace {ID :b .WorkspaceID })
4398
+ dbm .EXPECT ().GetProvisionerJobByID (gomock .Any (),j .ID ).Return (j ,nil ).AnyTimes ()
4399
+ dbm .EXPECT ().GetWorkspaceBuildByJobID (gomock .Any (),j .ID ).Return (b ,nil ).AnyTimes ()
4400
+ dbm .EXPECT ().GetWorkspaceByID (gomock .Any (),b .WorkspaceID ).Return (ws ,nil ).AnyTimes ()
4401
+ dbm .EXPECT ().GetProvisionerJobTimingsByJobID (gomock .Any (),j .ID ).Return ([]database.ProvisionerJobTiming {},nil ).AnyTimes ()
4402
+ check .Args (j .ID ).Asserts (ws ,policy .ActionRead )
4403
+ }))
4404
4404
s .Run ("GetWorkspaceAgentScriptTimingsByBuildID" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
4405
4405
build := testutil .Fake (s .T (),faker , database.WorkspaceBuild {})
4406
4406
dbm .EXPECT ().GetWorkspaceAgentScriptTimingsByBuildID (gomock .Any (),build .ID ).Return ([]database.GetWorkspaceAgentScriptTimingsByBuildIDRow {},nil ).AnyTimes ()
@@ -4466,31 +4466,33 @@ func (s *MethodTestSuite) TestSystemFunctions() {
4466
4466
dbm .EXPECT ().GetProvisionerJobByIDForUpdate (gomock .Any (),j .ID ).Return (j ,nil ).AnyTimes ()
4467
4467
// Minimal assertion check argument
4468
4468
b := testutil .Fake (s .T (),faker , database.WorkspaceBuild {JobID :j .ID })
4469
- w := testutil .Fake (s .T (),faker , database.Workspace {ID :b .WorkspaceID })
4470
- dbm .EXPECT ().GetWorkspaceBuildByJobID (gomock .Any (),j .ID ).Return (b ,nil ).AnyTimes ()
4471
- dbm .EXPECT ().GetWorkspaceByID (gomock .Any (),b .WorkspaceID ).Return (w ,nil ).AnyTimes ()
4472
- check .Args (j .ID ).Asserts (w ,policy .ActionRead ).Returns (j )
4469
+ w := testutil .Fake (s .T (),faker , database.Workspace {ID :b .WorkspaceID })
4470
+ dbm .EXPECT ().GetWorkspaceBuildByJobID (gomock .Any (),j .ID ).Return (b ,nil ).AnyTimes ()
4471
+ dbm .EXPECT ().GetWorkspaceByID (gomock .Any (),b .WorkspaceID ).Return (w ,nil ).AnyTimes ()
4472
+ check .Args (j .ID ).Asserts (w ,policy .ActionRead ).Returns (j )
4473
4473
}))
4474
4474
s .Run ("TemplateVersion/GetProvisionerJobByIDForUpdate" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
4475
- j := testutil .Fake (s .T (),faker , database.ProvisionerJob {Type :database .ProvisionerJobTypeTemplateVersionImport })
4476
- tpl := testutil .Fake (s .T (),faker , database.Template {})
4477
- tv := testutil .Fake (s .T (),faker , database.TemplateVersion {TemplateID : uuid.NullUUID {UUID :tpl .ID ,Valid :true }})
4478
- dbm .EXPECT ().GetProvisionerJobByIDForUpdate (gomock .Any (),j .ID ).Return (j ,nil ).AnyTimes ()
4479
- dbm .EXPECT ().GetTemplateVersionByJobID (gomock .Any (),j .ID ).Return (tv ,nil ).AnyTimes ()
4480
- dbm .EXPECT ().GetTemplateByID (gomock .Any (),tpl .ID ).Return (tpl ,nil ).AnyTimes ()
4481
- check .Args (j .ID ).Asserts (tv .RBACObject (tpl ),policy .ActionRead ).Returns (j )
4482
- }))
4483
- s .Run ("TemplateVersionDryRun/GetProvisionerJobByIDForUpdate" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
4484
- tpl := testutil .Fake (s .T (),faker , database.Template {})
4485
- tv := testutil .Fake (s .T (),faker , database.TemplateVersion {TemplateID : uuid.NullUUID {UUID :tpl .ID ,Valid :true }})
4486
- j := testutil .Fake (s .T (),faker , database.ProvisionerJob {})
4487
- j .Type = database .ProvisionerJobTypeTemplateVersionDryRun
4488
- j .Input = must (json .Marshal (struct {TemplateVersionID uuid.UUID `json:"template_version_id"` }{TemplateVersionID :tv .ID }))
4489
- dbm .EXPECT ().GetProvisionerJobByIDForUpdate (gomock .Any (),j .ID ).Return (j ,nil ).AnyTimes ()
4490
- dbm .EXPECT ().GetTemplateVersionByID (gomock .Any (),tv .ID ).Return (tv ,nil ).AnyTimes ()
4491
- dbm .EXPECT ().GetTemplateByID (gomock .Any (),tpl .ID ).Return (tpl ,nil ).AnyTimes ()
4492
- check .Args (j .ID ).Asserts (tv .RBACObject (tpl ),policy .ActionRead ).Returns (j )
4493
- }))
4475
+ j := testutil .Fake (s .T (),faker , database.ProvisionerJob {Type :database .ProvisionerJobTypeTemplateVersionImport })
4476
+ tpl := testutil .Fake (s .T (),faker , database.Template {})
4477
+ tv := testutil .Fake (s .T (),faker , database.TemplateVersion {TemplateID : uuid.NullUUID {UUID :tpl .ID ,Valid :true }})
4478
+ dbm .EXPECT ().GetProvisionerJobByIDForUpdate (gomock .Any (),j .ID ).Return (j ,nil ).AnyTimes ()
4479
+ dbm .EXPECT ().GetTemplateVersionByJobID (gomock .Any (),j .ID ).Return (tv ,nil ).AnyTimes ()
4480
+ dbm .EXPECT ().GetTemplateByID (gomock .Any (),tpl .ID ).Return (tpl ,nil ).AnyTimes ()
4481
+ check .Args (j .ID ).Asserts (tv .RBACObject (tpl ),policy .ActionRead ).Returns (j )
4482
+ }))
4483
+ s .Run ("TemplateVersionDryRun/GetProvisionerJobByIDForUpdate" ,s .Mocked (func (dbm * dbmock.MockStore ,faker * gofakeit.Faker ,check * expects ) {
4484
+ tpl := testutil .Fake (s .T (),faker , database.Template {})
4485
+ tv := testutil .Fake (s .T (),faker , database.TemplateVersion {TemplateID : uuid.NullUUID {UUID :tpl .ID ,Valid :true }})
4486
+ j := testutil .Fake (s .T (),faker , database.ProvisionerJob {})
4487
+ j .Type = database .ProvisionerJobTypeTemplateVersionDryRun
4488
+ j .Input = must (json .Marshal (struct {
4489
+ TemplateVersionID uuid.UUID `json:"template_version_id"`
4490
+ }{TemplateVersionID :tv .ID }))
4491
+ dbm .EXPECT ().GetProvisionerJobByIDForUpdate (gomock .Any (),j .ID ).Return (j ,nil ).AnyTimes ()
4492
+ dbm .EXPECT ().GetTemplateVersionByID (gomock .Any (),tv .ID ).Return (tv ,nil ).AnyTimes ()
4493
+ dbm .EXPECT ().GetTemplateByID (gomock .Any (),tpl .ID ).Return (tpl ,nil ).AnyTimes ()
4494
+ check .Args (j .ID ).Asserts (tv .RBACObject (tpl ),policy .ActionRead ).Returns (j )
4495
+ }))
4494
4496
}
4495
4497
4496
4498
func (s * MethodTestSuite )TestNotifications () {