Skip to content

Commit b70628a

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Fix dbauthz test
1 parent 2852164 commit b70628a

File tree

1 file changed

+69
-60
lines changed

1 file changed

+69
-60
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 69 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -551,26 +551,6 @@ func (s *MethodTestSuite) TestProvisionerJob() {
551551
check.Args(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}).
552552
Asserts(v.RBACObject(tpl), []policy.Action{policy.ActionRead, policy.ActionUpdate}).Returns()
553553
}))
554-
s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
555-
w := dbgen.Workspace(s.T(), db, database.Workspace{})
556-
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
557-
Type: database.ProvisionerJobTypeWorkspaceBuild,
558-
})
559-
_ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
560-
t := dbgen.ProvisionerJobTimings(s.T(), db, database.InsertProvisionerJobTimingsParams{
561-
JobID: j.ID,
562-
StartedAt: []time.Time{dbtime.Now(), dbtime.Now()},
563-
EndedAt: []time.Time{dbtime.Now(), dbtime.Now()},
564-
Stage: []database.ProvisionerJobTimingStage{
565-
database.ProvisionerJobTimingStageInit,
566-
database.ProvisionerJobTimingStagePlan,
567-
},
568-
Source: []string{"source1", "source2"},
569-
Action: []string{"action1", "action2"},
570-
Resource: []string{"resource1", "resource2"},
571-
})
572-
check.Args(j.ID).Asserts(w, policy.ActionRead).Returns(t)
573-
}))
574554
s.Run("GetProvisionerJobsByIDs", s.Subtest(func(db database.Store, check *expects) {
575555
a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
576556
b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
@@ -586,46 +566,6 @@ func (s *MethodTestSuite) TestProvisionerJob() {
586566
JobID: j.ID,
587567
}).Asserts(w, policy.ActionRead).Returns([]database.ProvisionerJobLog{})
588568
}))
589-
s.Run("GetWorkspaceAgentScriptTimingsByBuildID", s.Subtest(func(db database.Store, check *expects) {
590-
w := dbgen.Workspace(s.T(), db, database.Workspace{})
591-
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
592-
Type: database.ProvisionerJobTypeWorkspaceBuild,
593-
})
594-
b := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
595-
r := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{
596-
JobID: b.JobID,
597-
})
598-
a := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{
599-
ResourceID: r.ID,
600-
})
601-
scripts := dbgen.WorkspaceAgentScripts(s.T(), db, database.InsertWorkspaceAgentScriptsParams{
602-
WorkspaceAgentID: a.ID,
603-
CreatedAt: time.Now(),
604-
LogSourceID: []uuid.UUID{
605-
uuid.New(),
606-
},
607-
LogPath: []string{""},
608-
Script: []string{""},
609-
Cron: []string{""},
610-
StartBlocksLogin: []bool{false},
611-
RunOnStart: []bool{false},
612-
RunOnStop: []bool{false},
613-
TimeoutSeconds: []int32{0},
614-
DisplayName: []string{""},
615-
ID: []uuid.UUID{
616-
uuid.New(),
617-
},
618-
})
619-
t := dbgen.WorkspaceAgentScriptTiming(s.T(), db, database.InsertWorkspaceAgentScriptTimingsParams{
620-
StartedAt: dbtime.Now(),
621-
EndedAt: dbtime.Now(),
622-
Stage: database.WorkspaceAgentScriptTimingStageStart,
623-
ScriptID: scripts[0].ID,
624-
ExitCode: 0,
625-
Status: database.WorkspaceAgentScriptTimingStatusOk,
626-
})
627-
check.Args(b.ID).Asserts(w, policy.ActionRead).Returns(t)
628-
}))
629569
}
630570

631571
func (s *MethodTestSuite) TestLicense() {
@@ -2901,6 +2841,75 @@ func (s *MethodTestSuite) TestSystemFunctions() {
29012841
LastGeneratedAt: dbtime.Now(),
29022842
}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
29032843
}))
2844+
s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
2845+
w := dbgen.Workspace(s.T(), db, database.Workspace{})
2846+
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
2847+
Type: database.ProvisionerJobTypeWorkspaceBuild,
2848+
})
2849+
_ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
2850+
t := dbgen.ProvisionerJobTimings(s.T(), db, database.InsertProvisionerJobTimingsParams{
2851+
JobID: j.ID,
2852+
StartedAt: []time.Time{dbtime.Now(), dbtime.Now()},
2853+
EndedAt: []time.Time{dbtime.Now(), dbtime.Now()},
2854+
Stage: []database.ProvisionerJobTimingStage{
2855+
database.ProvisionerJobTimingStageInit,
2856+
database.ProvisionerJobTimingStagePlan,
2857+
},
2858+
Source: []string{"source1", "source2"},
2859+
Action: []string{"action1", "action2"},
2860+
Resource: []string{"resource1", "resource2"},
2861+
})
2862+
check.Args(j.ID).Asserts(j, policy.ActionRead).Returns(t)
2863+
}))
2864+
s.Run("GetWorkspaceAgentScriptTimingsByBuildID", s.Subtest(func(db database.Store, check *expects) {
2865+
workspace := dbgen.Workspace(s.T(), db, database.Workspace{})
2866+
job := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
2867+
Type: database.ProvisionerJobTypeWorkspaceBuild,
2868+
})
2869+
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: job.ID, WorkspaceID: workspace.ID})
2870+
resource := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{
2871+
JobID: build.JobID,
2872+
})
2873+
agent := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{
2874+
ResourceID: resource.ID,
2875+
})
2876+
scripts := dbgen.WorkspaceAgentScripts(s.T(), db, database.InsertWorkspaceAgentScriptsParams{
2877+
WorkspaceAgentID: agent.ID,
2878+
CreatedAt: time.Now(),
2879+
LogSourceID: []uuid.UUID{
2880+
uuid.New(),
2881+
},
2882+
LogPath: []string{""},
2883+
Script: []string{""},
2884+
Cron: []string{""},
2885+
StartBlocksLogin: []bool{false},
2886+
RunOnStart: []bool{false},
2887+
RunOnStop: []bool{false},
2888+
TimeoutSeconds: []int32{0},
2889+
DisplayName: []string{""},
2890+
ID: []uuid.UUID{
2891+
uuid.New(),
2892+
},
2893+
})
2894+
timing := dbgen.WorkspaceAgentScriptTiming(s.T(), db, database.InsertWorkspaceAgentScriptTimingsParams{
2895+
StartedAt: dbtime.Now(),
2896+
EndedAt: dbtime.Now(),
2897+
Stage: database.WorkspaceAgentScriptTimingStageStart,
2898+
ScriptID: scripts[0].ID,
2899+
ExitCode: 0,
2900+
Status: database.WorkspaceAgentScriptTimingStatusOk,
2901+
})
2902+
row := database.GetWorkspaceAgentScriptTimingsByBuildIDRow{
2903+
StartedAt: timing.StartedAt,
2904+
EndedAt: timing.EndedAt,
2905+
Stage: timing.Stage,
2906+
ScriptID: timing.ScriptID,
2907+
ExitCode: timing.ExitCode,
2908+
Status: timing.Status,
2909+
DisplayName: scripts[0].DisplayName,
2910+
}
2911+
check.Args(build.ID).Asserts(workspace, policy.ActionRead).Returns(row)
2912+
}))
29042913
}
29052914

29062915
func (s *MethodTestSuite) TestNotifications() {

0 commit comments

Comments
 (0)