Skip to content

feat(coderd): add workspace timings endpoint #14648

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 14 commits into from
Sep 16, 2024
Merged

feat(coderd): add workspace timings endpoint #14648

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
da5e478
feat(coderd): add workspace timings endpoint
BrunoQuaresma Sep 11, 2024
ddb570c
Fix verbiage
BrunoQuaresma Sep 12, 2024
d105dc7
Merge branch 'main' of https://github.com/coder/coder into bq/provisi…
BrunoQuaresma Sep 16, 2024
83ed6c5
Refactor timings response
BrunoQuaresma Sep 16, 2024
37c364a
Merge branch 'bq/provisioner-timings-endpoint' of https://github.com/…
BrunoQuaresma Sep 16, 2024
4015216
Tweaks
BrunoQuaresma Sep 16, 2024
01b4168
Fix date-time format for swagger
BrunoQuaresma Sep 16, 2024
aec73e8
Fix uuid format
BrunoQuaresma Sep 16, 2024
c9cbacf
Fix make gen
BrunoQuaresma Sep 16, 2024
0e55b09
Fix tests
BrunoQuaresma Sep 16, 2024
23286eb
Add authz test
BrunoQuaresma Sep 16, 2024
b7ad714
Fix authz test
BrunoQuaresma Sep 16, 2024
10846d2
Try to fix authz test with jobID outside
BrunoQuaresma Sep 16, 2024
9fd7fbe
Fix ws unique name
BrunoQuaresma Sep 16, 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 tests
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Sep 16, 2024
commit 0e55b09e4998c057ee9e72bdef8cbb0d2ea93046
12 changes: 9 additions & 3 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3298,6 +3298,9 @@ func (q *FakeQuerier) GetProvisionerJobTimingsByJobID(_ context.Context, jobID u
if len(timings) == 0 {
return nil, sql.ErrNoRows
}
sort.Slice(timings, func(i, j int) bool {
return timings[i].StartedAt.Before(timings[j].StartedAt)
})

return timings, nil
}
Expand Down Expand Up @@ -6804,19 +6807,22 @@ func (q *FakeQuerier) InsertProvisionerJobTimings(_ context.Context, arg databas
q.mutex.Lock()
defer q.mutex.Unlock()

insertedTimings := make([]database.ProvisionerJobTiming, 0, len(arg.StartedAt))
for i := range arg.StartedAt {
q.provisionerJobTimings = append(q.provisionerJobTimings, database.ProvisionerJobTiming{
timing := database.ProvisionerJobTiming{
JobID: arg.JobID,
StartedAt: arg.StartedAt[i],
EndedAt: arg.EndedAt[i],
Stage: arg.Stage[i],
Source: arg.Source[i],
Action: arg.Action[i],
Resource: arg.Resource[i],
})
}
q.provisionerJobTimings = append(q.provisionerJobTimings, timing)
insertedTimings = append(insertedTimings, timing)
}

return q.provisionerJobTimings, nil
return insertedTimings, nil
}

func (q *FakeQuerier) InsertProvisionerKey(_ context.Context, arg database.InsertProvisionerKeyParams) (database.ProvisionerKey, error) {
Expand Down
22 changes: 10 additions & 12 deletions coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3694,10 +3694,7 @@ func TestWorkspaceTimings(t *testing.T) {
t.Parallel()

// Generate timings based on test config
generatedTimings := make([]database.ProvisionerJobTiming, tc.provisionerTimings)
if tc.provisionerTimings > 0 {
generatedTimings = makeProvisionerTimings(tc.workspace.build.JobID, tc.provisionerTimings)
}
generatedTimings := makeProvisionerTimings(tc.workspace.build.JobID, tc.provisionerTimings)
res, err := client.WorkspaceTimings(context.Background(), tc.workspace.ID)

// When error is expected, than an error is returned
Expand All @@ -3709,16 +3706,17 @@ func TestWorkspaceTimings(t *testing.T) {
// When success is expected, than no error is returned and the length and
// fields are correctly returned
require.NoError(t, err)
require.Len(t, res, tc.provisionerTimings)
require.Len(t, res.ProvisionerTimings, tc.provisionerTimings)
for i := range res.ProvisionerTimings {
timingRes := res.ProvisionerTimings[i]
require.Equal(t, generatedTimings[i].Resource, timingRes.Resource)
require.Equal(t, generatedTimings[i].Action, timingRes.Action)
require.Equal(t, generatedTimings[i].Stage, timingRes.Stage)
require.Equal(t, generatedTimings[i].JobID, timingRes.JobID)
require.Equal(t, generatedTimings[i].Source, timingRes.Source)
require.Equal(t, generatedTimings[i].StartedAt.UnixMilli(), timingRes.StartedAt.UnixMilli())
require.Equal(t, generatedTimings[i].EndedAt.UnixMilli(), timingRes.EndedAt.UnixMilli())
genTiming := generatedTimings[i]
require.Equal(t, genTiming.Resource, timingRes.Resource)
require.Equal(t, genTiming.Action, timingRes.Action)
require.Equal(t, string(genTiming.Stage), timingRes.Stage)
require.Equal(t, genTiming.JobID.String(), timingRes.JobID.String())
require.Equal(t, genTiming.Source, timingRes.Source)
require.Equal(t, genTiming.StartedAt.UnixMilli(), timingRes.StartedAt.UnixMilli())
require.Equal(t, genTiming.EndedAt.UnixMilli(), timingRes.EndedAt.UnixMilli())
}
})
}
Expand Down
Loading