feat(provider/aws): retrieve 150 scaling activities instead of 30

spinnaker · Mar 3, 2017 · eec3be5 · eec3be5
1 parent 0690ff4
commit eec3be5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...n/groovy/com/netflix/spinnaker/clouddriver/aws/controllers/AmazonClusterController.groovy b/...n/groovy/com/netflix/spinnaker/clouddriver/aws/controllers/AmazonClusterController.groovy
@@ -36,7 +36,7 @@ class AmazonClusterController {
   @Autowired
   AmazonClientProvider amazonClientProvider
 
-  final static int MAX_SCALING_ACTIVITIES = 30
+  final static int MAX_SCALING_ACTIVITIES = 500
 
   @RequestMapping(value = "/scalingActivities", method = RequestMethod.GET)
   ResponseEntity getScalingActivities(@PathVariable String account, @PathVariable String serverGroupName, @RequestParam(value = "region", required = true) String region) {
@@ -50,7 +50,7 @@ class AmazonClusterController {
     List<Activity> scalingActivities = []
     while (scalingActivities.size() < MAX_SCALING_ACTIVITIES) {
       scalingActivities.addAll response.activities
-      if (response.nextToken) {
+      if (response.nextToken && scalingActivities.size() < MAX_SCALING_ACTIVITIES) {
         response = autoScaling.describeScalingActivities(request.withNextToken(response.nextToken))
       } else {
         break