Merge branch 'v7'

cloudfoundry · Oct 27, 2020 · cb1028a · cb1028a
2 parents e767438 + a78e718
commit cb1028a
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 11 deletions.
diff --git a/actor/v7action/application_summary.go b/actor/v7action/application_summary.go
@@ -4,6 +4,7 @@ import (
 	"code.cloudfoundry.org/cli/actor/actionerror"
 	"code.cloudfoundry.org/cli/api/cloudcontroller/ccv3"
 	"code.cloudfoundry.org/cli/resources"
+	"code.cloudfoundry.org/cli/util/batcher"
 )
 
 type ApplicationSummary struct {
@@ -47,9 +48,14 @@ func (actor Actor) GetAppSummariesForSpace(spaceGUID string, labelSelector strin
 	if err != nil {
 		return nil, allWarnings, err
 	}
-
-	processes, warnings, err := actor.CloudControllerClient.GetProcesses(ccv3.Query{
-		Key: ccv3.SpaceGUIDFilter, Values: []string{spaceGUID},
+	var processes []resources.Process
+
+	warnings, err = batcher.RequestByGUID(toAppGUIDs(apps), func(guids []string) (ccv3.Warnings, error) {
+		batch, warnings, err := actor.CloudControllerClient.GetProcesses(ccv3.Query{
+			Key: ccv3.AppGUIDFilter, Values: guids,
+		})
+		processes = append(processes, batch...)
+		return warnings, err
 	})
 	allWarnings = append(allWarnings, warnings...)
 	if err != nil {
@@ -77,10 +83,16 @@ func (actor Actor) GetAppSummariesForSpace(spaceGUID string, labelSelector strin
 		processSummariesByAppGUID[process.AppGUID] = append(processSummariesByAppGUID[process.AppGUID], processSummary)
 	}
 
-	routes, warnings, err := actor.CloudControllerClient.GetRoutes(ccv3.Query{
-		Key: ccv3.SpaceGUIDFilter, Values: []string{spaceGUID},
+	var routes []resources.Route
+
+	warnings, err = batcher.RequestByGUID(toAppGUIDs(apps), func(guids []string) (ccv3.Warnings, error) {
+		batch, warnings, err := actor.CloudControllerClient.GetRoutes(ccv3.Query{
+			Key: ccv3.AppGUIDFilter, Values: guids,
+		})
+		routes = append(routes, batch...)
+		return warnings, err
 	})
-	allWarnings = append(allWarnings, Warnings(warnings)...)
+	allWarnings = append(allWarnings, warnings...)
 	if err != nil {
 		return nil, allWarnings, err
 	}
@@ -169,3 +181,13 @@ func (actor Actor) addDroplet(summary ApplicationSummary) (DetailedApplicationSu
 		CurrentDroplet:     droplet,
 	}, allWarnings, nil
 }
+
+func toAppGUIDs(apps []resources.Application) []string {
+	guids := make([]string, len(apps))
+
+	for i, app := range apps {
+		guids[i] = app.GUID
+	}
+
+	return guids
+}
diff --git a/actor/v7action/application_summary_test.go b/actor/v7action/application_summary_test.go
@@ -2,6 +2,7 @@ package v7action_test
 
 import (
 	"errors"
+	"fmt"
 
 	"code.cloudfoundry.org/cli/actor/v7action"
 	. "code.cloudfoundry.org/cli/actor/v7action"
@@ -277,15 +278,11 @@ var _ = Describe("Application Summary Actions", func() {
 
 				Expect(fakeCloudControllerClient.GetProcessesCallCount()).To(Equal(1))
 				Expect(fakeCloudControllerClient.GetProcessesArgsForCall(0)).To(ConsistOf(
-					ccv3.Query{Key: ccv3.SpaceGUIDFilter, Values: []string{"some-space-guid"}},
+					ccv3.Query{Key: ccv3.AppGUIDFilter, Values: []string{"some-app-guid"}},
 				))
 
 				Expect(fakeCloudControllerClient.GetProcessInstancesCallCount()).To(Equal(2))
 				Expect(fakeCloudControllerClient.GetProcessInstancesArgsForCall(0)).To(Equal("some-process-guid"))
-
-				Expect(fakeCloudControllerClient.GetRoutesArgsForCall(0)).To(ConsistOf(
-					ccv3.Query{Key: ccv3.SpaceGUIDFilter, Values: []string{"some-space-guid"}},
-				))
 			})
 
 			When("there is no label selector", func() {
@@ -300,6 +297,48 @@ var _ = Describe("Application Summary Actions", func() {
 					))
 				})
 			})
+			When("there is long list of app guids", func() {
+				BeforeEach(func() {
+					lotsOfApps := []resources.Application{}
+					for i := 0; i < 600; i++ {
+						lotsOfApps = append(lotsOfApps, resources.Application{
+							Name:  "some-app-name",
+							GUID:  fmt.Sprintf("some-app-guid-%d", i),
+							State: constant.ApplicationStarted,
+						})
+					}
+					fakeCloudControllerClient.GetApplicationsReturns(
+						lotsOfApps,
+						ccv3.Warnings{"get-apps-warning"},
+						nil,
+					)
+				})
+
+				It("batches the calls to the API for processes", func() {
+					Expect(fakeCloudControllerClient.GetProcessesCallCount()).To(Equal(3))
+
+					getProcessesArgs := fakeCloudControllerClient.GetProcessesArgsForCall(0)
+					Expect(len(getProcessesArgs[0].Values)).To(Equal(200))
+					getProcessesArgs = fakeCloudControllerClient.GetProcessesArgsForCall(1)
+					Expect(len(getProcessesArgs[0].Values)).To(Equal(200))
+					getProcessesArgs = fakeCloudControllerClient.GetProcessesArgsForCall(2)
+					Expect(len(getProcessesArgs[0].Values)).To(Equal(200))
+
+					Expect(len(summaries)).To(Equal(600))
+				})
+				It("batches the calls to the API for routes", func() {
+					Expect(fakeCloudControllerClient.GetRoutesCallCount()).To(Equal(3))
+
+					getArgs := fakeCloudControllerClient.GetRoutesArgsForCall(0)
+					Expect(len(getArgs[0].Values)).To(Equal(200))
+					getArgs = fakeCloudControllerClient.GetRoutesArgsForCall(1)
+					Expect(len(getArgs[0].Values)).To(Equal(200))
+					getArgs = fakeCloudControllerClient.GetRoutesArgsForCall(2)
+					Expect(len(getArgs[0].Values)).To(Equal(200))
+
+					Expect(len(summaries)).To(Equal(600))
+				})
+			})
 		})
 
 		When("getting the application fails", func() {