Skip to content

Commit 8f15ca1

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Add agent ID and name on agent script timing response
1 parent df34858 commit 8f15ca1

File tree

13 files changed

+101
-47
lines changed

13 files changed

+101
-47
lines changed

‎coderd/apidoc/docs.go

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,13 +2873,15 @@ func (s *MethodTestSuite) TestSystemFunctions() {
28732873
})
28742874
rows := []database.GetWorkspaceAgentScriptTimingsByBuildIDRow{
28752875
{
2876-
StartedAt: timing.StartedAt,
2877-
EndedAt: timing.EndedAt,
2878-
Stage: timing.Stage,
2879-
ScriptID: timing.ScriptID,
2880-
ExitCode: timing.ExitCode,
2881-
Status: timing.Status,
2882-
DisplayName: script.DisplayName,
2876+
StartedAt: timing.StartedAt,
2877+
EndedAt: timing.EndedAt,
2878+
Stage: timing.Stage,
2879+
ScriptID: timing.ScriptID,
2880+
ExitCode: timing.ExitCode,
2881+
Status: timing.Status,
2882+
DisplayName: script.DisplayName,
2883+
WorkspaceAgentID: agent.ID,
2884+
WorkspaceAgentName: agent.Name,
28832885
},
28842886
}
28852887
check.Args(build.ID).Asserts(rbac.ResourceSystem, policy.ActionRead).Returns(rows)

‎coderd/database/dbmem/dbmem.go

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5893,14 +5893,24 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Contex
58935893
}
58945894
}
58955895

5896+
var agent database.WorkspaceAgent
5897+
for _, a := range agents {
5898+
if a.ID == script.WorkspaceAgentID {
5899+
agent = a
5900+
break
5901+
}
5902+
}
5903+
58965904
rows = append(rows, database.GetWorkspaceAgentScriptTimingsByBuildIDRow{
5897-
ScriptID: t.ScriptID,
5898-
StartedAt: t.StartedAt,
5899-
EndedAt: t.EndedAt,
5900-
ExitCode: t.ExitCode,
5901-
Stage: t.Stage,
5902-
Status: t.Status,
5903-
DisplayName: script.DisplayName,
5905+
ScriptID: t.ScriptID,
5906+
StartedAt: t.StartedAt,
5907+
EndedAt: t.EndedAt,
5908+
ExitCode: t.ExitCode,
5909+
Stage: t.Stage,
5910+
Status: t.Status,
5911+
DisplayName: script.DisplayName,
5912+
WorkspaceAgentID: agent.ID,
5913+
WorkspaceAgentName: agent.Name,
59045914
})
59055915
}
59065916
return rows, nil

‎coderd/database/queries.sql.go

Lines changed: 16 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceagents.sql

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,11 @@ VALUES
303303
RETURNING workspace_agent_script_timings.*;
304304

305305
-- name: GetWorkspaceAgentScriptTimingsByBuildID :many
306-
SELECT workspace_agent_script_timings.*, workspace_agent_scripts.display_name
306+
SELECT
307+
workspace_agent_script_timings.*,
308+
workspace_agent_scripts.display_name,
309+
workspace_agents.id as workspace_agent_id,
310+
workspace_agents.name as workspace_agent_name
307311
FROM workspace_agent_script_timings
308312
INNER JOIN workspace_agent_scripts ON workspace_agent_scripts.id = workspace_agent_script_timings.script_id
309313
INNER JOIN workspace_agents ON workspace_agents.id = workspace_agent_scripts.workspace_agent_id

‎coderd/workspacebuilds.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,12 +1002,14 @@ func (api *API) buildTimings(ctx context.Context, build database.WorkspaceBuild)
10021002
}
10031003
for _, t := range agentScriptTimings {
10041004
res.AgentScriptTimings = append(res.AgentScriptTimings, codersdk.AgentScriptTiming{
1005-
StartedAt: t.StartedAt,
1006-
EndedAt: t.EndedAt,
1007-
ExitCode: t.ExitCode,
1008-
Stage: string(t.Stage),
1009-
Status: string(t.Status),
1010-
DisplayName: t.DisplayName,
1005+
StartedAt: t.StartedAt,
1006+
EndedAt: t.EndedAt,
1007+
ExitCode: t.ExitCode,
1008+
Stage: string(t.Stage),
1009+
Status: string(t.Status),
1010+
DisplayName: t.DisplayName,
1011+
WorkspaceAgentID: t.WorkspaceAgentID.String(),
1012+
WorkspaceAgentName: t.WorkspaceAgentName,
10111013
})
10121014
}
10131015

‎coderd/workspacebuilds_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,8 @@ func TestWorkspaceBuildTimings(t *testing.T) {
13201320
require.Equal(t, string(genTiming.Stage), timingRes.Stage)
13211321
require.Equal(t, genTiming.StartedAt.UnixMilli(), timingRes.StartedAt.UnixMilli())
13221322
require.Equal(t, genTiming.EndedAt.UnixMilli(), timingRes.EndedAt.UnixMilli())
1323+
require.Equal(t, agent.ID.String(), timingRes.WorkspaceAgentID)
1324+
require.Equal(t, agent.Name, timingRes.WorkspaceAgentName)
13231325
}
13241326
})
13251327

‎codersdk/workspacebuilds.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,14 @@ type ProvisionerTiming struct {
186186
}
187187

188188
type AgentScriptTiming struct {
189-
StartedAt time.Time `json:"started_at" format:"date-time"`
190-
EndedAt time.Time `json:"ended_at" format:"date-time"`
191-
ExitCode int32 `json:"exit_code"`
192-
Stage string `json:"stage"`
193-
Status string `json:"status"`
194-
DisplayName string `json:"display_name"`
189+
StartedAt time.Time `json:"started_at" format:"date-time"`
190+
EndedAt time.Time `json:"ended_at" format:"date-time"`
191+
ExitCode int32 `json:"exit_code"`
192+
Stage string `json:"stage"`
193+
Status string `json:"status"`
194+
DisplayName string `json:"display_name"`
195+
WorkspaceAgentID string `json:"workspace_agent_id"`
196+
WorkspaceAgentName string `json:"workspace_agent_name"`
195197
}
196198

197199
type WorkspaceBuildTimings struct {

‎docs/reference/api/builds.md

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/api/schemas.md

Lines changed: 16 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/api/workspaces.md

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/api/typesGenerated.ts

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)