Skip to content

Commit 8853449

Browse files
stainless-app[bot]stainless-app[bot]
committed
fix(pagination): handle errors when applying options
1 parent 6155e91 commit 8853449

File tree

1 file changed

+80
-20
lines changed

1 file changed

+80
-20
lines changed

‎packages/pagination/pagination.go‎

Lines changed: 80 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ func (r *DomainVerificationsPage[T]) GetNextPage() (res *DomainVerificationsPage
6565
return nil, nil
6666
}
6767
cfg := r.cfg.Clone(r.cfg.Context)
68-
cfg.Apply(option.WithQuery("token", next))
68+
err = cfg.Apply(option.WithQuery("token", next))
69+
if err != nil {
70+
return nil, err
71+
}
6972
var raw *http.Response
7073
cfg.ResponseInto = &raw
7174
cfg.ResponseBodyInto = &res
@@ -183,7 +186,10 @@ func (r *EditorsPage[T]) GetNextPage() (res *EditorsPage[T], err error) {
183186
return nil, nil
184187
}
185188
cfg := r.cfg.Clone(r.cfg.Context)
186-
cfg.Apply(option.WithQuery("token", next))
189+
err = cfg.Apply(option.WithQuery("token", next))
190+
if err != nil {
191+
return nil, err
192+
}
187193
var raw *http.Response
188194
cfg.ResponseInto = &raw
189195
cfg.ResponseBodyInto = &res
@@ -301,7 +307,10 @@ func (r *EntriesPage[T]) GetNextPage() (res *EntriesPage[T], err error) {
301307
return nil, nil
302308
}
303309
cfg := r.cfg.Clone(r.cfg.Context)
304-
cfg.Apply(option.WithQuery("token", next))
310+
err = cfg.Apply(option.WithQuery("token", next))
311+
if err != nil {
312+
return nil, err
313+
}
305314
var raw *http.Response
306315
cfg.ResponseInto = &raw
307316
cfg.ResponseBodyInto = &res
@@ -420,7 +429,10 @@ func (r *EnvironmentClassesPage[T]) GetNextPage() (res *EnvironmentClassesPage[T
420429
return nil, nil
421430
}
422431
cfg := r.cfg.Clone(r.cfg.Context)
423-
cfg.Apply(option.WithQuery("token", next))
432+
err = cfg.Apply(option.WithQuery("token", next))
433+
if err != nil {
434+
return nil, err
435+
}
424436
var raw *http.Response
425437
cfg.ResponseInto = &raw
426438
cfg.ResponseBodyInto = &res
@@ -539,7 +551,10 @@ func (r *EnvironmentsPage[T]) GetNextPage() (res *EnvironmentsPage[T], err error
539551
return nil, nil
540552
}
541553
cfg := r.cfg.Clone(r.cfg.Context)
542-
cfg.Apply(option.WithQuery("token", next))
554+
err = cfg.Apply(option.WithQuery("token", next))
555+
if err != nil {
556+
return nil, err
557+
}
543558
var raw *http.Response
544559
cfg.ResponseInto = &raw
545560
cfg.ResponseBodyInto = &res
@@ -657,7 +672,10 @@ func (r *GroupsPage[T]) GetNextPage() (res *GroupsPage[T], err error) {
657672
return nil, nil
658673
}
659674
cfg := r.cfg.Clone(r.cfg.Context)
660-
cfg.Apply(option.WithQuery("token", next))
675+
err = cfg.Apply(option.WithQuery("token", next))
676+
if err != nil {
677+
return nil, err
678+
}
661679
var raw *http.Response
662680
cfg.ResponseInto = &raw
663681
cfg.ResponseBodyInto = &res
@@ -776,7 +794,10 @@ func (r *IntegrationsPage[T]) GetNextPage() (res *IntegrationsPage[T], err error
776794
return nil, nil
777795
}
778796
cfg := r.cfg.Clone(r.cfg.Context)
779-
cfg.Apply(option.WithQuery("token", next))
797+
err = cfg.Apply(option.WithQuery("token", next))
798+
if err != nil {
799+
return nil, err
800+
}
780801
var raw *http.Response
781802
cfg.ResponseInto = &raw
782803
cfg.ResponseBodyInto = &res
@@ -895,7 +916,10 @@ func (r *LoginProvidersPage[T]) GetNextPage() (res *LoginProvidersPage[T], err e
895916
return nil, nil
896917
}
897918
cfg := r.cfg.Clone(r.cfg.Context)
898-
cfg.Apply(option.WithQuery("token", next))
919+
err = cfg.Apply(option.WithQuery("token", next))
920+
if err != nil {
921+
return nil, err
922+
}
899923
var raw *http.Response
900924
cfg.ResponseInto = &raw
901925
cfg.ResponseBodyInto = &res
@@ -1013,7 +1037,10 @@ func (r *MembersPage[T]) GetNextPage() (res *MembersPage[T], err error) {
10131037
return nil, nil
10141038
}
10151039
cfg := r.cfg.Clone(r.cfg.Context)
1016-
cfg.Apply(option.WithQuery("token", next))
1040+
err = cfg.Apply(option.WithQuery("token", next))
1041+
if err != nil {
1042+
return nil, err
1043+
}
10171044
var raw *http.Response
10181045
cfg.ResponseInto = &raw
10191046
cfg.ResponseBodyInto = &res
@@ -1132,7 +1159,10 @@ func (r *OrganizationsPage[T]) GetNextPage() (res *OrganizationsPage[T], err err
11321159
return nil, nil
11331160
}
11341161
cfg := r.cfg.Clone(r.cfg.Context)
1135-
cfg.Apply(option.WithQuery("token", next))
1162+
err = cfg.Apply(option.WithQuery("token", next))
1163+
if err != nil {
1164+
return nil, err
1165+
}
11361166
var raw *http.Response
11371167
cfg.ResponseInto = &raw
11381168
cfg.ResponseBodyInto = &res
@@ -1251,7 +1281,10 @@ func (r *PersonalAccessTokensPage[T]) GetNextPage() (res *PersonalAccessTokensPa
12511281
return nil, nil
12521282
}
12531283
cfg := r.cfg.Clone(r.cfg.Context)
1254-
cfg.Apply(option.WithQuery("token", next))
1284+
err = cfg.Apply(option.WithQuery("token", next))
1285+
if err != nil {
1286+
return nil, err
1287+
}
12551288
var raw *http.Response
12561289
cfg.ResponseInto = &raw
12571290
cfg.ResponseBodyInto = &res
@@ -1369,7 +1402,10 @@ func (r *PoliciesPage[T]) GetNextPage() (res *PoliciesPage[T], err error) {
13691402
return nil, nil
13701403
}
13711404
cfg := r.cfg.Clone(r.cfg.Context)
1372-
cfg.Apply(option.WithQuery("token", next))
1405+
err = cfg.Apply(option.WithQuery("token", next))
1406+
if err != nil {
1407+
return nil, err
1408+
}
13731409
var raw *http.Response
13741410
cfg.ResponseInto = &raw
13751411
cfg.ResponseBodyInto = &res
@@ -1487,7 +1523,10 @@ func (r *ProjectsPage[T]) GetNextPage() (res *ProjectsPage[T], err error) {
14871523
return nil, nil
14881524
}
14891525
cfg := r.cfg.Clone(r.cfg.Context)
1490-
cfg.Apply(option.WithQuery("token", next))
1526+
err = cfg.Apply(option.WithQuery("token", next))
1527+
if err != nil {
1528+
return nil, err
1529+
}
14911530
var raw *http.Response
14921531
cfg.ResponseInto = &raw
14931532
cfg.ResponseBodyInto = &res
@@ -1605,7 +1644,10 @@ func (r *RunnersPage[T]) GetNextPage() (res *RunnersPage[T], err error) {
16051644
return nil, nil
16061645
}
16071646
cfg := r.cfg.Clone(r.cfg.Context)
1608-
cfg.Apply(option.WithQuery("token", next))
1647+
err = cfg.Apply(option.WithQuery("token", next))
1648+
if err != nil {
1649+
return nil, err
1650+
}
16091651
var raw *http.Response
16101652
cfg.ResponseInto = &raw
16111653
cfg.ResponseBodyInto = &res
@@ -1723,7 +1765,10 @@ func (r *SecretsPage[T]) GetNextPage() (res *SecretsPage[T], err error) {
17231765
return nil, nil
17241766
}
17251767
cfg := r.cfg.Clone(r.cfg.Context)
1726-
cfg.Apply(option.WithQuery("token", next))
1768+
err = cfg.Apply(option.WithQuery("token", next))
1769+
if err != nil {
1770+
return nil, err
1771+
}
17271772
var raw *http.Response
17281773
cfg.ResponseInto = &raw
17291774
cfg.ResponseBodyInto = &res
@@ -1841,7 +1886,10 @@ func (r *ServicesPage[T]) GetNextPage() (res *ServicesPage[T], err error) {
18411886
return nil, nil
18421887
}
18431888
cfg := r.cfg.Clone(r.cfg.Context)
1844-
cfg.Apply(option.WithQuery("token", next))
1889+
err = cfg.Apply(option.WithQuery("token", next))
1890+
if err != nil {
1891+
return nil, err
1892+
}
18451893
var raw *http.Response
18461894
cfg.ResponseInto = &raw
18471895
cfg.ResponseBodyInto = &res
@@ -1960,7 +2008,10 @@ func (r *SSOConfigurationsPage[T]) GetNextPage() (res *SSOConfigurationsPage[T],
19602008
return nil, nil
19612009
}
19622010
cfg := r.cfg.Clone(r.cfg.Context)
1963-
cfg.Apply(option.WithQuery("token", next))
2011+
err = cfg.Apply(option.WithQuery("token", next))
2012+
if err != nil {
2013+
return nil, err
2014+
}
19642015
var raw *http.Response
19652016
cfg.ResponseInto = &raw
19662017
cfg.ResponseBodyInto = &res
@@ -2079,7 +2130,10 @@ func (r *TaskExecutionsPage[T]) GetNextPage() (res *TaskExecutionsPage[T], err e
20792130
return nil, nil
20802131
}
20812132
cfg := r.cfg.Clone(r.cfg.Context)
2082-
cfg.Apply(option.WithQuery("token", next))
2133+
err = cfg.Apply(option.WithQuery("token", next))
2134+
if err != nil {
2135+
return nil, err
2136+
}
20832137
var raw *http.Response
20842138
cfg.ResponseInto = &raw
20852139
cfg.ResponseBodyInto = &res
@@ -2197,7 +2251,10 @@ func (r *TasksPage[T]) GetNextPage() (res *TasksPage[T], err error) {
21972251
return nil, nil
21982252
}
21992253
cfg := r.cfg.Clone(r.cfg.Context)
2200-
cfg.Apply(option.WithQuery("token", next))
2254+
err = cfg.Apply(option.WithQuery("token", next))
2255+
if err != nil {
2256+
return nil, err
2257+
}
22012258
var raw *http.Response
22022259
cfg.ResponseInto = &raw
22032260
cfg.ResponseBodyInto = &res
@@ -2315,7 +2372,10 @@ func (r *TokensPage[T]) GetNextPage() (res *TokensPage[T], err error) {
23152372
return nil, nil
23162373
}
23172374
cfg := r.cfg.Clone(r.cfg.Context)
2318-
cfg.Apply(option.WithQuery("token", next))
2375+
err = cfg.Apply(option.WithQuery("token", next))
2376+
if err != nil {
2377+
return nil, err
2378+
}
23192379
var raw *http.Response
23202380
cfg.ResponseInto = &raw
23212381
cfg.ResponseBodyInto = &res

0 commit comments

Comments
 (0)