Skip to content

feat(coderd): return agent script timings #14923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Oct 14, 2024
Merged

feat(coderd): return agent script timings #14923

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1b62a39
feat(coderd): return agent script timings
BrunoQuaresma Oct 1, 2024
3daab59
Apply initial suggestions and improvements
BrunoQuaresma Oct 2, 2024
1c6671e
Merge branch 'main' of https://github.com/coder/coder into bq/feat-ag…
BrunoQuaresma Oct 3, 2024
15ca638
Move timings to build and improve tests
BrunoQuaresma Oct 3, 2024
ddde7a3
Fix lint and gen
BrunoQuaresma Oct 3, 2024
5abc511
Fix @Router notation
BrunoQuaresma Oct 3, 2024
bcd8b04
Improve tests intention
BrunoQuaresma Oct 3, 2024
f4c3331
Fix date-time format
BrunoQuaresma Oct 4, 2024
2852164
Add dbauthz test
BrunoQuaresma Oct 4, 2024
b70628a
Fix dbauthz test
BrunoQuaresma Oct 4, 2024
9e09c64
Fix policy
BrunoQuaresma Oct 4, 2024
7786166
Fix test again
BrunoQuaresma Oct 4, 2024
ed4cbd0
Fix asserts
BrunoQuaresma Oct 4, 2024
920e41d
Fix order
BrunoQuaresma Oct 4, 2024
65aeeea
Wrap errors and set timeout for tests
BrunoQuaresma Oct 4, 2024
c7ae412
Add back the workspace timings endpoint
BrunoQuaresma Oct 4, 2024
aaedd1c
Fix unique build number
BrunoQuaresma Oct 4, 2024
a846eb7
Wait long
BrunoQuaresma Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix dbauthz test
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Oct 4, 2024
commit b70628a88ec7d305041d0c6c20db9b6ac9d24b99
129 changes: 69 additions & 60 deletions coderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,26 +551,6 @@ func (s *MethodTestSuite) TestProvisionerJob() {
check.Args(database.UpdateProvisionerJobWithCancelByIDParams{ID: j.ID}).
Asserts(v.RBACObject(tpl), []policy.Action{policy.ActionRead, policy.ActionUpdate}).Returns()
}))
s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
w := dbgen.Workspace(s.T(), db, database.Workspace{})
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
Type: database.ProvisionerJobTypeWorkspaceBuild,
})
_ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
t := dbgen.ProvisionerJobTimings(s.T(), db, database.InsertProvisionerJobTimingsParams{
JobID: j.ID,
StartedAt: []time.Time{dbtime.Now(), dbtime.Now()},
EndedAt: []time.Time{dbtime.Now(), dbtime.Now()},
Stage: []database.ProvisionerJobTimingStage{
database.ProvisionerJobTimingStageInit,
database.ProvisionerJobTimingStagePlan,
},
Source: []string{"source1", "source2"},
Action: []string{"action1", "action2"},
Resource: []string{"resource1", "resource2"},
})
check.Args(j.ID).Asserts(w, policy.ActionRead).Returns(t)
}))
s.Run("GetProvisionerJobsByIDs", s.Subtest(func(db database.Store, check *expects) {
a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
Expand All @@ -586,46 +566,6 @@ func (s *MethodTestSuite) TestProvisionerJob() {
JobID: j.ID,
}).Asserts(w, policy.ActionRead).Returns([]database.ProvisionerJobLog{})
}))
s.Run("GetWorkspaceAgentScriptTimingsByBuildID", s.Subtest(func(db database.Store, check *expects) {
w := dbgen.Workspace(s.T(), db, database.Workspace{})
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
Type: database.ProvisionerJobTypeWorkspaceBuild,
})
b := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
r := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{
JobID: b.JobID,
})
a := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{
ResourceID: r.ID,
})
scripts := dbgen.WorkspaceAgentScripts(s.T(), db, database.InsertWorkspaceAgentScriptsParams{
WorkspaceAgentID: a.ID,
CreatedAt: time.Now(),
LogSourceID: []uuid.UUID{
uuid.New(),
},
LogPath: []string{""},
Script: []string{""},
Cron: []string{""},
StartBlocksLogin: []bool{false},
RunOnStart: []bool{false},
RunOnStop: []bool{false},
TimeoutSeconds: []int32{0},
DisplayName: []string{""},
ID: []uuid.UUID{
uuid.New(),
},
})
t := dbgen.WorkspaceAgentScriptTiming(s.T(), db, database.InsertWorkspaceAgentScriptTimingsParams{
StartedAt: dbtime.Now(),
EndedAt: dbtime.Now(),
Stage: database.WorkspaceAgentScriptTimingStageStart,
ScriptID: scripts[0].ID,
ExitCode: 0,
Status: database.WorkspaceAgentScriptTimingStatusOk,
})
check.Args(b.ID).Asserts(w, policy.ActionRead).Returns(t)
}))
}

func (s *MethodTestSuite) TestLicense() {
Expand Down Expand Up @@ -2901,6 +2841,75 @@ func (s *MethodTestSuite) TestSystemFunctions() {
LastGeneratedAt: dbtime.Now(),
}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
}))
s.Run("GetProvisionerJobTimingsByJobID", s.Subtest(func(db database.Store, check *expects) {
w := dbgen.Workspace(s.T(), db, database.Workspace{})
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
Type: database.ProvisionerJobTypeWorkspaceBuild,
})
_ = dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: j.ID, WorkspaceID: w.ID})
t := dbgen.ProvisionerJobTimings(s.T(), db, database.InsertProvisionerJobTimingsParams{
JobID: j.ID,
StartedAt: []time.Time{dbtime.Now(), dbtime.Now()},
EndedAt: []time.Time{dbtime.Now(), dbtime.Now()},
Stage: []database.ProvisionerJobTimingStage{
database.ProvisionerJobTimingStageInit,
database.ProvisionerJobTimingStagePlan,
},
Source: []string{"source1", "source2"},
Action: []string{"action1", "action2"},
Resource: []string{"resource1", "resource2"},
})
check.Args(j.ID).Asserts(j, policy.ActionRead).Returns(t)
}))
s.Run("GetWorkspaceAgentScriptTimingsByBuildID", s.Subtest(func(db database.Store, check *expects) {
workspace := dbgen.Workspace(s.T(), db, database.Workspace{})
job := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{
Type: database.ProvisionerJobTypeWorkspaceBuild,
})
build := dbgen.WorkspaceBuild(s.T(), db, database.WorkspaceBuild{JobID: job.ID, WorkspaceID: workspace.ID})
resource := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{
JobID: build.JobID,
})
agent := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{
ResourceID: resource.ID,
})
scripts := dbgen.WorkspaceAgentScripts(s.T(), db, database.InsertWorkspaceAgentScriptsParams{
WorkspaceAgentID: agent.ID,
CreatedAt: time.Now(),
LogSourceID: []uuid.UUID{
uuid.New(),
},
LogPath: []string{""},
Script: []string{""},
Cron: []string{""},
StartBlocksLogin: []bool{false},
RunOnStart: []bool{false},
RunOnStop: []bool{false},
TimeoutSeconds: []int32{0},
DisplayName: []string{""},
ID: []uuid.UUID{
uuid.New(),
},
})
timing := dbgen.WorkspaceAgentScriptTiming(s.T(), db, database.InsertWorkspaceAgentScriptTimingsParams{
StartedAt: dbtime.Now(),
EndedAt: dbtime.Now(),
Stage: database.WorkspaceAgentScriptTimingStageStart,
ScriptID: scripts[0].ID,
ExitCode: 0,
Status: database.WorkspaceAgentScriptTimingStatusOk,
})
row := database.GetWorkspaceAgentScriptTimingsByBuildIDRow{
StartedAt: timing.StartedAt,
EndedAt: timing.EndedAt,
Stage: timing.Stage,
ScriptID: timing.ScriptID,
ExitCode: timing.ExitCode,
Status: timing.Status,
DisplayName: scripts[0].DisplayName,
}
check.Args(build.ID).Asserts(workspace, policy.ActionRead).Returns(row)
}))
}

func (s *MethodTestSuite) TestNotifications() {
Expand Down
Loading