fix pagination handling

cloudflare · Jun 26, 2023 · 1e579b5 · 1e579b5
1 parent 0ca81ca
commit 1e579b5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 38 deletions.
diff --git a/access_application.go b/access_application.go
@@ -113,7 +113,7 @@ type SaasApplication struct {
 }
 
 type ListAccessApplicationsParams struct {
-	PaginationOptions
+	ResultInfo
 }
 
 type CreateAccessApplicationParams struct {
@@ -187,15 +187,11 @@ func (api *API) ListAccessApplications(ctx context.Context, rc *ResourceContaine
 		params.Page = 1
 	}
 
-	resultInfo := ResultInfo{
-		Page:    params.Page,
-		PerPage: params.PerPage,
-	}
-
 	var applications []AccessApplication
 	var r AccessApplicationListResponse
+
 	for {
-		uri := buildURI(baseURL, resultInfo)
+		uri := buildURI(baseURL, params)
 
 		res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 		if err != nil {
@@ -207,8 +203,8 @@ func (api *API) ListAccessApplications(ctx context.Context, rc *ResourceContaine
 			return []AccessApplication{}, &ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 		}
 		applications = append(applications, r.Result...)
-		resultInfo = r.ResultInfo.Next()
-		if resultInfo.Done() || autoPaginate {
+		params.ResultInfo = r.ResultInfo.Next()
+		if params.ResultInfo.Done() || autoPaginate {
 			break
 		}
 	}

diff --git a/access_ca_certificate.go b/access_ca_certificate.go
@@ -31,7 +31,7 @@ type AccessCACertificateResponse struct {
 }
 
 type ListAccessCACertificatesParams struct {
-	PaginationOptions
+	ResultInfo
 }
 
 type CreateAccessCACertificateParams struct {
@@ -58,16 +58,11 @@ func (api *API) ListAccessCACertificates(ctx context.Context, rc *ResourceContai
 		params.Page = 1
 	}
 
-	resultInfo := ResultInfo{
-		Page:    params.Page,
-		PerPage: params.PerPage,
-	}
-
 	var accessCACertificates []AccessCACertificate
 	var r AccessCACertificateListResponse
 
 	for {
-		uri := buildURI(baseURL, resultInfo)
+		uri := buildURI(baseURL, params)
 		res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 		if err != nil {
 			return []AccessCACertificate{}, &ResultInfo{}, fmt.Errorf("%s: %w", errMakeRequestError, err)
@@ -78,13 +73,13 @@ func (api *API) ListAccessCACertificates(ctx context.Context, rc *ResourceContai
 			return []AccessCACertificate{}, &ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 		}
 		accessCACertificates = append(accessCACertificates, r.Result...)
-		resultInfo = r.ResultInfo.Next()
-		if resultInfo.Done() || autoPaginate {
+		params.ResultInfo = r.ResultInfo.Next()
+		if params.ResultInfo.Done() || autoPaginate {
 			break
 		}
 	}
 
-	return accessCACertificates, &resultInfo, nil
+	return accessCACertificates, &r.ResultInfo, nil
 }
 
 // GetAccessCACertificate returns a single CA certificate associated within

diff --git a/access_group.go b/access_group.go
@@ -204,7 +204,7 @@ type AccessGroupDetailResponse struct {
 }
 
 type ListAccessGroupsParams struct {
-	PaginationOptions
+	ResultInfo
 }
 
 type CreateAccessGroupParams struct {
@@ -260,16 +260,11 @@ func (api *API) ListAccessGroups(ctx context.Context, rc *ResourceContainer, par
 		params.Page = 1
 	}
 
-	resultInfo := ResultInfo{
-		Page:    params.Page,
-		PerPage: params.PerPage,
-	}
-
 	var accessGroups []AccessGroup
 	var r AccessGroupListResponse
 
 	for {
-		uri := buildURI(baseURL, resultInfo)
+		uri := buildURI(baseURL, params)
 		res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 		if err != nil {
 			return []AccessGroup{}, &ResultInfo{}, fmt.Errorf("%s: %w", errMakeRequestError, err)
@@ -280,8 +275,8 @@ func (api *API) ListAccessGroups(ctx context.Context, rc *ResourceContainer, par
 			return []AccessGroup{}, &ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 		}
 		accessGroups = append(accessGroups, r.Result...)
-		resultInfo = r.ResultInfo.Next()
-		if resultInfo.Done() || autoPaginate {
+		params.ResultInfo = r.ResultInfo.Next()
+		if params.ResultInfo.Done() || autoPaginate {
 			break
 		}
 	}

diff --git a/access_group_test.go b/access_group_test.go
@@ -91,15 +91,15 @@ func TestAccessGroups(t *testing.T) {
 
 	mux.HandleFunc("/accounts/"+testAccountID+"/access/groups", handler)
 
-	actual, _, err := client.ListAccessGroups(context.Background(), testAccountRC, ListAccessGroupsParams{PaginationOptions{}})
+	actual, _, err := client.ListAccessGroups(context.Background(), testAccountRC, ListAccessGroupsParams{ResultInfo{}})
 
 	if assert.NoError(t, err) {
 		assert.Equal(t, []AccessGroup{expectedAccessGroup}, actual)
 	}
 
 	mux.HandleFunc("/zones/"+testZoneID+"/access/groups", handler)
 
-	actual, _, err = client.ListAccessGroups(context.Background(), testZoneRC, ListAccessGroupsParams{PaginationOptions{}})
+	actual, _, err = client.ListAccessGroups(context.Background(), testZoneRC, ListAccessGroupsParams{ResultInfo{}})
 
 	if assert.NoError(t, err) {
 		assert.Equal(t, []AccessGroup{expectedAccessGroup}, actual)

diff --git a/access_mutual_tls_certificates.go b/access_mutual_tls_certificates.go
@@ -81,16 +81,11 @@ func (api *API) ListAccessMutualTLSCertificates(ctx context.Context, rc *Resourc
 		params.Page = 1
 	}
 
-	resultInfo := ResultInfo{
-		Page:    params.Page,
-		PerPage: params.PerPage,
-	}
-
 	var accessCertificates []AccessMutualTLSCertificate
 	var r AccessMutualTLSCertificateListResponse
 
 	for {
-		uri := buildURI(baseURL, resultInfo)
+		uri := buildURI(baseURL, params)
 		res, err := api.makeRequestContext(ctx, http.MethodGet, uri, nil)
 		if err != nil {
 			return []AccessMutualTLSCertificate{}, &ResultInfo{}, fmt.Errorf("%s: %w", errMakeRequestError, err)
@@ -101,8 +96,8 @@ func (api *API) ListAccessMutualTLSCertificates(ctx context.Context, rc *Resourc
 			return []AccessMutualTLSCertificate{}, &ResultInfo{}, fmt.Errorf("%s: %w", errUnmarshalError, err)
 		}
 		accessCertificates = append(accessCertificates, r.Result...)
-		resultInfo = r.ResultInfo.Next()
-		if resultInfo.Done() || autoPaginate {
+		params.ResultInfo = r.ResultInfo.Next()
+		if params.ResultInfo.Done() || autoPaginate {
 			break
 		}
 	}