Update pagination to compute current page based off total_count

.changelog/1372.txt

@@ -0,0 +1,23 @@
+```release-note:bug
+pagination: Will look at `total_count` and `per_page` to calculate `total_pages` if `total_pages` is zero
+```
+
+```release-note:bug
+access_application: Use autopaginate flag as expected
+```
+
+```release-note:bug
+access_ca_certificate: Use autopaginate flag as expected
+```
+
+```release-note:bug
+access_group: Use autopaginate flag as expected
+```
+
+```release-note:bug
+access_mutual_tls_certifcate: Use autopaginate flag as expected
+```
+
+```release-note:bug
+access_policy: Use autopaginate flag as expected
+```

access_application.go

@@ -208,7 +208,7 @@ func (api *API) ListAccessApplications(ctx context.Context, rc *ResourceContaine
 		}
 		applications = append(applications, r.Result...)
 		params.ResultInfo = r.ResultInfo.Next()
-		if params.ResultInfo.Done() || autoPaginate {
+		if params.ResultInfo.Done() || !autoPaginate {
 			break
 		}
 	}

access_application_test.go

@@ -54,7 +54,7 @@ func TestAccessApplications(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)

access_bookmark_test.go

@@ -36,7 +36,7 @@ func TestAccessBookmarks(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)

access_ca_certificate.go

@@ -75,7 +75,7 @@ func (api *API) ListAccessCACertificates(ctx context.Context, rc *ResourceContai
 		}
 		accessCACertificates = append(accessCACertificates, r.Result...)
 		params.ResultInfo = r.ResultInfo.Next()
-		if params.ResultInfo.Done() || autoPaginate {
+		if params.ResultInfo.Done() || !autoPaginate {
 			break
 		}
 	}

access_group.go

@@ -286,7 +286,7 @@ func (api *API) ListAccessGroups(ctx context.Context, rc *ResourceContainer, par
 		}
 		accessGroups = append(accessGroups, r.Result...)
 		params.ResultInfo = r.ResultInfo.Next()
-		if params.ResultInfo.Done() || autoPaginate {
+		if params.ResultInfo.Done() || !autoPaginate {
 			break
 		}
 	}

access_group_test.go

@@ -83,7 +83,7 @@ func TestAccessGroups(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)

access_mutual_tls_certificates.go

@@ -98,7 +98,7 @@ func (api *API) ListAccessMutualTLSCertificates(ctx context.Context, rc *Resourc
 		}
 		accessCertificates = append(accessCertificates, r.Result...)
 		params.ResultInfo = r.ResultInfo.Next()
-		if params.ResultInfo.Done() || autoPaginate {
+		if params.ResultInfo.Done() || !autoPaginate {
 			break
 		}
 	}

access_policy.go

@@ -178,7 +178,7 @@ func (api *API) ListAccessPolicies(ctx context.Context, rc *ResourceContainer, p
 		}
 		accessPolicies = append(accessPolicies, r.Result...)
 		params.ResultInfo = r.ResultInfo.Next()
-		if params.ResultInfo.Done() || autoPaginate {
+		if params.ResultInfo.Done() || !autoPaginate {
 			break
 		}
 	}

account_members_test.go

@@ -182,7 +182,7 @@ func TestAccountMembers(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -459,7 +459,7 @@ func TestUpdateAccountMember(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -523,7 +523,7 @@ func TestUpdateAccountMemberWithPolicies(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}`)
 	}

account_roles_test.go

@@ -51,7 +51,7 @@ func TestAccountRoles(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -97,7 +97,7 @@ func TestAccountRole(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)

accounts_test.go

@@ -48,7 +48,7 @@ func TestAccounts(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -87,7 +87,7 @@ func TestAccount(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -183,7 +183,7 @@ func TestCreateAccount(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)

cloudflare_test.go

@@ -181,7 +181,7 @@ func TestClient_RetryCanSucceedAfterErrors(t *testing.T) {
                 "page": 1,
                 "per_page": 20,
                 "count": 1,
-                "total_count": 2000
+                "total_count": 1
             }
         }`)
 		}

custom_pages_test.go

@@ -82,7 +82,7 @@ func TestCustomPagesForZone(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -128,7 +128,7 @@ func TestCustomPagesForAccount(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -172,7 +172,7 @@ func TestCustomPageForZone(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -215,7 +215,7 @@ func TestCustomPageForAccount(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -258,7 +258,7 @@ func TestUpdateCustomPagesForAccount(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)
@@ -300,7 +300,7 @@ func TestUpdateCustomPagesForZone(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)

device_posture_rule_test.go

@@ -40,7 +40,7 @@ func TestDevicePostureIntegrations(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}`)
 	}
@@ -288,7 +288,7 @@ func TestDevicePostureRules(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}
 		`)

dns_test.go

@@ -196,7 +196,7 @@ func TestListDNSRecords(t *testing.T) {
 				"count": 1,
 				"page": 1,
 				"per_page": 20,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}`)
 	}
@@ -292,7 +292,7 @@ func TestListDNSRecordsSearch(t *testing.T) {
 				"count": 1,
 				"page": 1,
 				"per_page": 20,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}`)
 	}
@@ -337,7 +337,7 @@ func TestListDNSRecordsSearch(t *testing.T) {
 		Tags:      []string{"tag1", "tag2"},
 	})
 	require.NoError(t, err)
-	assert.Equal(t, 2000, resultInfo.Total)
+	assert.Equal(t, 1, resultInfo.Total)
 
 	assert.Equal(t, want, actual)
 }

load_balancing_test.go

@@ -296,7 +296,7 @@ func TestListLoadBalancerPools(t *testing.T) {
                 "page": 1,
                 "per_page": 20,
                 "count": 1,
-                "total_count": 2000
+                "total_count": 1
             }
         }`)
 	}
@@ -760,7 +760,7 @@ func TestListLoadBalancerMonitors(t *testing.T) {
                 "page": 1,
                 "per_page": 20,
                 "count": 1,
-                "total_count": 2000
+                "total_count": 1
             }
         }`)
 	}
@@ -1497,7 +1497,7 @@ func TestListLoadBalancers(t *testing.T) {
                 "page": 1,
                 "per_page": 20,
                 "count": 1,
-                "total_count": 2000
+                "total_count": 1
             }
         }`)
 	}

lockdown_test.go

@@ -274,7 +274,7 @@ func TestListZoneLockdowns(t *testing.T) {
 				"page": 1,
 				"per_page": 20,
 				"count": 1,
-				"total_count": 2000
+				"total_count": 1
 			}
 		}`)
 	}

origin_ca_test.go

@@ -129,7 +129,7 @@ func TestOriginCA_OriginCertificates(t *testing.T) {
     "page": 1,
     "per_page": 20,
     "count": 1,
-    "total_count": 2000
+    "total_count": 1
   }
 }`)
 	})

pagination.go

@@ -1,15 +1,29 @@
 package cloudflare
 
+import (
+	"math"
+)
+
+// Look first for total_pages, but if total_count and per_page are set then use that to get page count.
+func (p ResultInfo) getTotalPages() int {
+	totalPages := p.TotalPages
+	if totalPages == 0 && p.Total > 0 && p.PerPage > 0 {
+		totalPages = int(math.Ceil(float64(p.Total) / float64(p.PerPage)))
+	}
+	return totalPages
+}
+
 // Done returns true for the last page and false otherwise.
 func (p ResultInfo) Done() bool {
 	// A little hacky but if the response body is lacking a defined `ResultInfo`
 	// object the page will be 1 however the counts will be empty so if we have
 	// that response, we just assume this is the only page.
-	if p.Page == 1 && p.TotalPages == 0 {
+	totalPages := p.getTotalPages()
+	if p.Page == 1 && totalPages == 0 {
 		return true
 	}
 
-	return p.Page > 1 && p.Page > p.TotalPages
+	return p.Page > 1 && p.Page > totalPages
 }
 
 // Next advances the page of a paginated API response, but does not fetch the
@@ -18,13 +32,14 @@ func (p ResultInfo) Next() ResultInfo {
 	// A little hacky but if the response body is lacking a defined `ResultInfo`
 	// object the page will be 1 however the counts will be empty so if we have
 	// that response, we just assume this is the only page.
-	if p.Page == 1 && p.TotalPages == 0 {
+	totalPages := p.getTotalPages()
+	if p.Page == 1 && totalPages == 0 {
 		return p
 	}
 
 	// This shouldn't happen normally however, when it does just return the
 	// current page.
-	if p.Page > p.TotalPages {
+	if p.Page > totalPages {
 		return p
 	}
 
@@ -35,9 +50,10 @@ func (p ResultInfo) Next() ResultInfo {
 // HasMorePages returns whether there is another page of results after the
 // current one.
 func (p ResultInfo) HasMorePages() bool {
-	if p.TotalPages == 0 {
+	totalPages := p.getTotalPages()
+	if totalPages == 0 {
 		return false
 	}
 
-	return p.Page >= 1 && p.Page < p.TotalPages
+	return p.Page >= 1 && p.Page < totalPages
 }