Merge pull request #160 from replicatedhq/divolgin/ls

Show correct channels for customers

Author: divolgin

pkg/kotsclient/customer_list.go

@@ -25,19 +25,22 @@ type CustomerListResponse struct {
 
 func (c *VendorV3Client) ListCustomers(appID string) ([]types.Customer, error) {
 	allCustomers := []types.Customer{}
-	resp := CustomerListResponse{}
 	page := 0
-	for len(allCustomers) < resp.TotalCustomers || page == 0 {
+	for {
+		resp := CustomerListResponse{}
 		path := fmt.Sprintf("/v3/app/%s/customers?currentPage=%d", appID, page)
 		err := c.DoJSON("GET", path, http.StatusOK, nil, &resp)
 		if err != nil {
 			return nil, errors.Wrapf(err, "list customers page %d", page)
 		}
+
 		allCustomers = append(allCustomers, resp.Customers...)
-		page = page + 1
-		if len(resp.Customers) == 0 {
+
+		if len(allCustomers) == resp.TotalCustomers || len(resp.Customers) == 0 {
 			break
 		}
+
+		page = page + 1
 	}
 
 	return allCustomers, nil

pkg/kotsclient/release.go

@@ -121,10 +121,10 @@ func (c *GraphQLClient) UpdateRelease(appID string, sequence int64, multiyaml st
 
 func (c *VendorV3Client) ListReleases(appID string) ([]types.ReleaseInfo, error) {
 	allReleases := []types.ReleaseInfo{}
-	resp := types.ListReleasesResponse{}
 	done := false
 	page := 0
 	for !done {
+		resp := types.ListReleasesResponse{}
 		path := fmt.Sprintf("/v3/app/%s/releases?currentPage=%d&pageSize=20", appID, page)
 		err := c.DoJSON("GET", path, http.StatusOK, nil, &resp)
 		if err != nil {
@@ -146,7 +146,6 @@ func (c *VendorV3Client) ListReleases(appID string) ([]types.ReleaseInfo, error)
 				activeChannels = append(activeChannels, activeChannel)
 			}
 
-
 			newReleaseInfo := types.ReleaseInfo{
 				ActiveChannels: activeChannels,
 				AppID:          release.AppID,