From 8717df897dd8ab8f851e2330e84d44bc76ab535d Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 5 Feb 2025 14:39:44 +0000 Subject: [PATCH 1/2] fix(coderd): set default provisionerjobs limit to 50 --- coderd/provisionerjobs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go index 591c60855a65e..647274d9c29f7 100644 --- a/coderd/provisionerjobs.go +++ b/coderd/provisionerjobs.go @@ -101,7 +101,7 @@ func (api *API) handleAuthAndFetchProvisionerJobs(rw http.ResponseWriter, r *htt qp := r.URL.Query() p := httpapi.NewQueryParamParser() - limit := p.PositiveInt32(qp, 0, "limit") + limit := p.PositiveInt32(qp, 50, "limit") status := p.Strings(qp, nil, "status") p.ErrorExcessParams(qp) if len(p.Errors) > 0 { From 5c917d3df9c8e76eb91d8193eebd171ffcf01fe2 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 5 Feb 2025 14:54:28 +0000 Subject: [PATCH 2/2] add limit teset --- coderd/provisionerjobs_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/coderd/provisionerjobs_test.go b/coderd/provisionerjobs_test.go index a8fd4f2a968f2..098e118327c40 100644 --- a/coderd/provisionerjobs_test.go +++ b/coderd/provisionerjobs_test.go @@ -63,6 +63,13 @@ func TestProvisionerJobs(t *testing.T) { TemplateVersionID: version.ID, }) + // Add more jobs than the default limit. + for range 60 { + dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{ + OrganizationID: owner.OrganizationID, + }) + } + t.Run("Single", func(t *testing.T) { t.Parallel() t.Run("OK", func(t *testing.T) { @@ -82,12 +89,12 @@ func TestProvisionerJobs(t *testing.T) { }) }) - t.Run("All", func(t *testing.T) { + t.Run("Default limit", func(t *testing.T) { t.Parallel() ctx := testutil.Context(t, testutil.WaitMedium) jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil) require.NoError(t, err) - require.Len(t, jobs, 3) + require.Len(t, jobs, 50) }) t.Run("Status", func(t *testing.T) {