Skip to content

Commit 8d9d6fb

Browse files
fix(pagination): check if page data is empty in GetNextPage
1 parent 2c731e3 commit 8d9d6fb

File tree

1 file changed

+63
-0
lines changed

1 file changed

+63
-0
lines changed

packages/pagination/pagination.go

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ func (r domainVerificationsPageJSON) RawJSON() string {
6060
// there is no next page, this function will return a 'nil' for the page value, but
6161
// will not return an error
6262
func (r *DomainVerificationsPage[T]) GetNextPage() (res *DomainVerificationsPage[T], err error) {
63+
if len(r.DomainVerifications) == 0 {
64+
return nil, nil
65+
}
6366
next := r.Pagination.NextToken
6467
if len(next) == 0 {
6568
return nil, nil
@@ -181,6 +184,9 @@ func (r editorsPageJSON) RawJSON() string {
181184
// there is no next page, this function will return a 'nil' for the page value, but
182185
// will not return an error
183186
func (r *EditorsPage[T]) GetNextPage() (res *EditorsPage[T], err error) {
187+
if len(r.Editors) == 0 {
188+
return nil, nil
189+
}
184190
next := r.Pagination.NextToken
185191
if len(next) == 0 {
186192
return nil, nil
@@ -302,6 +308,9 @@ func (r entriesPageJSON) RawJSON() string {
302308
// there is no next page, this function will return a 'nil' for the page value, but
303309
// will not return an error
304310
func (r *EntriesPage[T]) GetNextPage() (res *EntriesPage[T], err error) {
311+
if len(r.Entries) == 0 {
312+
return nil, nil
313+
}
305314
next := r.Pagination.NextToken
306315
if len(next) == 0 {
307316
return nil, nil
@@ -424,6 +433,9 @@ func (r environmentClassesPageJSON) RawJSON() string {
424433
// there is no next page, this function will return a 'nil' for the page value, but
425434
// will not return an error
426435
func (r *EnvironmentClassesPage[T]) GetNextPage() (res *EnvironmentClassesPage[T], err error) {
436+
if len(r.EnvironmentClasses) == 0 {
437+
return nil, nil
438+
}
427439
next := r.Pagination.NextToken
428440
if len(next) == 0 {
429441
return nil, nil
@@ -546,6 +558,9 @@ func (r environmentsPageJSON) RawJSON() string {
546558
// there is no next page, this function will return a 'nil' for the page value, but
547559
// will not return an error
548560
func (r *EnvironmentsPage[T]) GetNextPage() (res *EnvironmentsPage[T], err error) {
561+
if len(r.Environments) == 0 {
562+
return nil, nil
563+
}
549564
next := r.Pagination.NextToken
550565
if len(next) == 0 {
551566
return nil, nil
@@ -667,6 +682,9 @@ func (r gatewaysPageJSON) RawJSON() string {
667682
// there is no next page, this function will return a 'nil' for the page value, but
668683
// will not return an error
669684
func (r *GatewaysPage[T]) GetNextPage() (res *GatewaysPage[T], err error) {
685+
if len(r.Gateways) == 0 {
686+
return nil, nil
687+
}
670688
next := r.Pagination.NextToken
671689
if len(next) == 0 {
672690
return nil, nil
@@ -788,6 +806,9 @@ func (r groupsPageJSON) RawJSON() string {
788806
// there is no next page, this function will return a 'nil' for the page value, but
789807
// will not return an error
790808
func (r *GroupsPage[T]) GetNextPage() (res *GroupsPage[T], err error) {
809+
if len(r.Groups) == 0 {
810+
return nil, nil
811+
}
791812
next := r.Pagination.NextToken
792813
if len(next) == 0 {
793814
return nil, nil
@@ -910,6 +931,9 @@ func (r integrationsPageJSON) RawJSON() string {
910931
// there is no next page, this function will return a 'nil' for the page value, but
911932
// will not return an error
912933
func (r *IntegrationsPage[T]) GetNextPage() (res *IntegrationsPage[T], err error) {
934+
if len(r.Integrations) == 0 {
935+
return nil, nil
936+
}
913937
next := r.Pagination.NextToken
914938
if len(next) == 0 {
915939
return nil, nil
@@ -1032,6 +1056,9 @@ func (r loginProvidersPageJSON) RawJSON() string {
10321056
// there is no next page, this function will return a 'nil' for the page value, but
10331057
// will not return an error
10341058
func (r *LoginProvidersPage[T]) GetNextPage() (res *LoginProvidersPage[T], err error) {
1059+
if len(r.LoginProviders) == 0 {
1060+
return nil, nil
1061+
}
10351062
next := r.Pagination.NextToken
10361063
if len(next) == 0 {
10371064
return nil, nil
@@ -1153,6 +1180,9 @@ func (r membersPageJSON) RawJSON() string {
11531180
// there is no next page, this function will return a 'nil' for the page value, but
11541181
// will not return an error
11551182
func (r *MembersPage[T]) GetNextPage() (res *MembersPage[T], err error) {
1183+
if len(r.Members) == 0 {
1184+
return nil, nil
1185+
}
11561186
next := r.Pagination.NextToken
11571187
if len(next) == 0 {
11581188
return nil, nil
@@ -1275,6 +1305,9 @@ func (r personalAccessTokensPageJSON) RawJSON() string {
12751305
// there is no next page, this function will return a 'nil' for the page value, but
12761306
// will not return an error
12771307
func (r *PersonalAccessTokensPage[T]) GetNextPage() (res *PersonalAccessTokensPage[T], err error) {
1308+
if len(r.PersonalAccessTokens) == 0 {
1309+
return nil, nil
1310+
}
12781311
next := r.Pagination.NextToken
12791312
if len(next) == 0 {
12801313
return nil, nil
@@ -1396,6 +1429,9 @@ func (r policiesPageJSON) RawJSON() string {
13961429
// there is no next page, this function will return a 'nil' for the page value, but
13971430
// will not return an error
13981431
func (r *PoliciesPage[T]) GetNextPage() (res *PoliciesPage[T], err error) {
1432+
if len(r.Policies) == 0 {
1433+
return nil, nil
1434+
}
13991435
next := r.Pagination.NextToken
14001436
if len(next) == 0 {
14011437
return nil, nil
@@ -1517,6 +1553,9 @@ func (r projectsPageJSON) RawJSON() string {
15171553
// there is no next page, this function will return a 'nil' for the page value, but
15181554
// will not return an error
15191555
func (r *ProjectsPage[T]) GetNextPage() (res *ProjectsPage[T], err error) {
1556+
if len(r.Projects) == 0 {
1557+
return nil, nil
1558+
}
15201559
next := r.Pagination.NextToken
15211560
if len(next) == 0 {
15221561
return nil, nil
@@ -1638,6 +1677,9 @@ func (r recordsPageJSON) RawJSON() string {
16381677
// there is no next page, this function will return a 'nil' for the page value, but
16391678
// will not return an error
16401679
func (r *RecordsPage[T]) GetNextPage() (res *RecordsPage[T], err error) {
1680+
if len(r.Records) == 0 {
1681+
return nil, nil
1682+
}
16411683
next := r.Pagination.NextToken
16421684
if len(next) == 0 {
16431685
return nil, nil
@@ -1759,6 +1801,9 @@ func (r runnersPageJSON) RawJSON() string {
17591801
// there is no next page, this function will return a 'nil' for the page value, but
17601802
// will not return an error
17611803
func (r *RunnersPage[T]) GetNextPage() (res *RunnersPage[T], err error) {
1804+
if len(r.Runners) == 0 {
1805+
return nil, nil
1806+
}
17621807
next := r.Pagination.NextToken
17631808
if len(next) == 0 {
17641809
return nil, nil
@@ -1880,6 +1925,9 @@ func (r secretsPageJSON) RawJSON() string {
18801925
// there is no next page, this function will return a 'nil' for the page value, but
18811926
// will not return an error
18821927
func (r *SecretsPage[T]) GetNextPage() (res *SecretsPage[T], err error) {
1928+
if len(r.Secrets) == 0 {
1929+
return nil, nil
1930+
}
18831931
next := r.Pagination.NextToken
18841932
if len(next) == 0 {
18851933
return nil, nil
@@ -2001,6 +2049,9 @@ func (r servicesPageJSON) RawJSON() string {
20012049
// there is no next page, this function will return a 'nil' for the page value, but
20022050
// will not return an error
20032051
func (r *ServicesPage[T]) GetNextPage() (res *ServicesPage[T], err error) {
2052+
if len(r.Services) == 0 {
2053+
return nil, nil
2054+
}
20042055
next := r.Pagination.NextToken
20052056
if len(next) == 0 {
20062057
return nil, nil
@@ -2123,6 +2174,9 @@ func (r ssoConfigurationsPageJSON) RawJSON() string {
21232174
// there is no next page, this function will return a 'nil' for the page value, but
21242175
// will not return an error
21252176
func (r *SSOConfigurationsPage[T]) GetNextPage() (res *SSOConfigurationsPage[T], err error) {
2177+
if len(r.SSOConfigurations) == 0 {
2178+
return nil, nil
2179+
}
21262180
next := r.Pagination.NextToken
21272181
if len(next) == 0 {
21282182
return nil, nil
@@ -2245,6 +2299,9 @@ func (r taskExecutionsPageJSON) RawJSON() string {
22452299
// there is no next page, this function will return a 'nil' for the page value, but
22462300
// will not return an error
22472301
func (r *TaskExecutionsPage[T]) GetNextPage() (res *TaskExecutionsPage[T], err error) {
2302+
if len(r.TaskExecutions) == 0 {
2303+
return nil, nil
2304+
}
22482305
next := r.Pagination.NextToken
22492306
if len(next) == 0 {
22502307
return nil, nil
@@ -2366,6 +2423,9 @@ func (r tasksPageJSON) RawJSON() string {
23662423
// there is no next page, this function will return a 'nil' for the page value, but
23672424
// will not return an error
23682425
func (r *TasksPage[T]) GetNextPage() (res *TasksPage[T], err error) {
2426+
if len(r.Tasks) == 0 {
2427+
return nil, nil
2428+
}
23692429
next := r.Pagination.NextToken
23702430
if len(next) == 0 {
23712431
return nil, nil
@@ -2487,6 +2547,9 @@ func (r tokensPageJSON) RawJSON() string {
24872547
// there is no next page, this function will return a 'nil' for the page value, but
24882548
// will not return an error
24892549
func (r *TokensPage[T]) GetNextPage() (res *TokensPage[T], err error) {
2550+
if len(r.Tokens) == 0 {
2551+
return nil, nil
2552+
}
24902553
next := r.Pagination.NextToken
24912554
if len(next) == 0 {
24922555
return nil, nil

0 commit comments

Comments
 (0)