Skip to content

Commit c0ae1ba

Browse files
dannykoppingdannykopping
committed
Remove stats API call, will follow up in another PR
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent 3d77c63 commit c0ae1ba

File tree

13 files changed

+0
-379
lines changed

13 files changed

+0
-379
lines changed

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 82 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: 0 additions & 78 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/coderd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,6 @@ func New(options *Options) *API {
11531153
r.Get("/parameters", api.workspaceBuildParameters)
11541154
r.Get("/resources", api.workspaceBuildResourcesDeprecated)
11551155
r.Get("/state", api.workspaceBuildState)
1156-
r.Get("/stats", api.workspaceBuildStats)
11571156
})
11581157
r.Route("/authcheck", func(r chi.Router) {
11591158
r.Use(apiKeyMiddleware)

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,15 +1775,6 @@ func (q *querier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (data
17751775
return job, nil
17761776
}
17771777

1778-
func (q *querier) GetProvisionerJobStatsByWorkspace(ctx context.Context, arg database.GetProvisionerJobStatsByWorkspaceParams) (database.ProvisionerJobStat, error) {
1779-
// Use the workspace ID to authorize the request.
1780-
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspace.WithID(arg.WorkspaceID)); err != nil {
1781-
return database.ProvisionerJobStat{}, err
1782-
}
1783-
1784-
return q.db.GetProvisionerJobStatsByWorkspace(ctx, arg)
1785-
}
1786-
17871778
// TODO: we need to add a provisioner job resource
17881779
func (q *querier) GetProvisionerJobsByIDs(ctx context.Context, ids []uuid.UUID) ([]database.ProvisionerJob, error) {
17891780
// if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {

‎coderd/database/dbmem/dbmem.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,30 +3172,6 @@ func (q *FakeQuerier) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (
31723172
return q.getProvisionerJobByIDNoLock(ctx, id)
31733173
}
31743174

3175-
func (*FakeQuerier) GetProvisionerJobStatsByWorkspace(_ context.Context, arg database.GetProvisionerJobStatsByWorkspaceParams) (database.ProvisionerJobStat, error) {
3176-
err := validateDatabaseType(arg)
3177-
if err != nil {
3178-
return database.ProvisionerJobStat{}, err
3179-
}
3180-
3181-
return database.ProvisionerJobStat{
3182-
JobID: arg.JobID,
3183-
JobStatus: database.ProvisionerJobStatusSucceeded,
3184-
WorkspaceID: arg.WorkspaceID,
3185-
WorkerID: uuid.NullUUID{UUID: uuid.New(), Valid: true},
3186-
Error: sql.NullString{},
3187-
ErrorCode: sql.NullString{},
3188-
UpdatedAt: dbtime.Now(),
3189-
QueuedSecs: 0.1,
3190-
CompletionSecs: 10,
3191-
CanceledSecs: 0,
3192-
InitSecs: 1,
3193-
PlanSecs: 2,
3194-
GraphSecs: 3,
3195-
ApplySecs: 4,
3196-
}, nil
3197-
}
3198-
31993175
func (q *FakeQuerier) GetProvisionerJobsByIDs(_ context.Context, ids []uuid.UUID) ([]database.ProvisionerJob, error) {
32003176
q.mutex.RLock()
32013177
defer q.mutex.RUnlock()

‎coderd/database/dbmetrics/dbmetrics.go

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

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/querier.go

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

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/provisionerjobs.sql

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,3 @@ SELECT
156156
unnest(@action::text[]) AS action,
157157
unnest(@resource::text[]) AS resource
158158
RETURNING *;
159-
160-
-- We include the workspace here so we can authorize the request correctly.
161-
-- name: GetProvisionerJobStatsByWorkspace :one
162-
SELECT * FROM provisioner_job_stats
163-
WHERE job_id = @job_id::uuid AND workspace_id = @workspace_id::uuid
164-
LIMIT 1;

‎coderd/workspacebuilds.go

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -648,40 +648,6 @@ func (api *API) workspaceBuildState(rw http.ResponseWriter, r *http.Request) {
648648
_, _ = rw.Write(workspaceBuild.ProvisionerState)
649649
}
650650

651-
// @Summary Get stats for workspace build
652-
// @ID get-stats-for-workspace-build
653-
// @Security CoderSessionToken
654-
// @Produce json
655-
// @Tags Builds
656-
// @Param workspacebuild path string true "Workspace build ID"
657-
// @Success 200 {object} codersdk.WorkspaceBuildStats
658-
// @Router /workspacebuilds/{workspacebuild}/stats [get]
659-
func (api *API) workspaceBuildStats(rw http.ResponseWriter, r *http.Request) {
660-
ctx := r.Context()
661-
workspaceBuild := httpmw.WorkspaceBuildParam(r)
662-
663-
if workspaceBuild.JobID == uuid.Nil {
664-
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
665-
Message: "Failed to retrieve provisioner job ID from workspace build",
666-
})
667-
return
668-
}
669-
670-
pj, err := api.Database.GetProvisionerJobStatsByWorkspace(ctx, database.GetProvisionerJobStatsByWorkspaceParams{
671-
JobID: workspaceBuild.JobID,
672-
WorkspaceID: workspaceBuild.WorkspaceID,
673-
})
674-
if err != nil {
675-
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
676-
Message: "Failed to get workspace build stats",
677-
Detail: err.Error(),
678-
})
679-
return
680-
}
681-
682-
httpapi.Write(ctx, rw, http.StatusOK, convertWorkspaceBuildStats(pj))
683-
}
684-
685651
type workspaceBuildsData struct {
686652
users []database.User
687653
jobs []database.GetProvisionerJobsByIDsWithQueuePositionRow

0 commit comments

Comments
 (0)