Alter our counting to always use maxPageSize as the increment.

Azure · Nov 10, 2021 · 798aecf · 798aecf
1 parent 5e6f237
commit 798aecf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/sdk/messaging/azservicebus/admin/admin_client_queue.go b/sdk/messaging/azservicebus/admin/admin_client_queue.go
@@ -483,7 +483,7 @@ func (p *queueRuntimePropertiesPager) Err() error {
 
 type queueFeedPagerFunc func(ctx context.Context) (*atom.QueueFeed, *http.Response, error)
 
-func (ac *Client) getQueuePager(maxPageSize int32, skip int) queueFeedPagerFunc {
+func (ac *Client) getQueuePager(maxPageSize int32, skip int32) queueFeedPagerFunc {
 	return func(ctx context.Context) (*atom.QueueFeed, *http.Response, error) {
 		url := "/$Resources/Queues?"
 		if maxPageSize > 0 {
@@ -505,7 +505,7 @@ func (ac *Client) getQueuePager(maxPageSize int32, skip int) queueFeedPagerFunc
 			return nil, nil, nil
 		}
 
-		skip += len(atomResp.Entries)
+		skip += maxPageSize
 		return atomResp, resp, nil
 	}
 }

diff --git a/sdk/messaging/azservicebus/admin/admin_client_subscription.go b/sdk/messaging/azservicebus/admin/admin_client_subscription.go
@@ -537,7 +537,7 @@ func (p *subscriptionRuntimePropertiesPager) getNextPage(ctx context.Context) (*
 
 type subscriptionFeedPagerFunc func(ctx context.Context) (*atom.SubscriptionFeed, *http.Response, error)
 
-func (ac *Client) getSubscriptionPager(topicName string, maxPageSize int32, skip int) subscriptionFeedPagerFunc {
+func (ac *Client) getSubscriptionPager(topicName string, maxPageSize int32, skip int32) subscriptionFeedPagerFunc {
 	return func(ctx context.Context) (*atom.SubscriptionFeed, *http.Response, error) {
 		url := fmt.Sprintf("/%s/Subscriptions?", topicName)
 		if maxPageSize > 0 {
@@ -555,7 +555,7 @@ func (ac *Client) getSubscriptionPager(topicName string, maxPageSize int32, skip
 			return nil, nil, err
 		}
 
-		skip += len(atomResp.Entries)
+		skip += maxPageSize
 		return atomResp, resp, nil
 	}
 }
diff --git a/sdk/messaging/azservicebus/admin/admin_client_topic.go b/sdk/messaging/azservicebus/admin/admin_client_topic.go
@@ -339,7 +339,7 @@ func (ac *Client) getTopicPager(maxPageSize int32, skip int32) topicFeedPagerFun
 			return nil, nil, nil
 		}
 
-		skip += int32(len(atomResp.Entries))
+		skip += maxPageSize
 		return atomResp, resp, nil
 	}
 }