Merge pull request #28 from wking/tag-20-load-balancers-per-request

awstagdeprovision: Tag 20 load balancers (max) per request
openshift · Sep 29, 2018 · a050d77 · a050d77
2 parents 41846e8 + e49201c
commit a050d77
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/contrib/pkg/awstagdeprovision/awstagdeprovision.go b/contrib/pkg/awstagdeprovision/awstagdeprovision.go
@@ -307,9 +307,18 @@ func deleteLBs(awsSession *session.Session, filters awsFilter, clusterName strin
 			return false, nil
 		}
 
-		lbObjects, err := lbToAWSObjects(results.LoadBalancerDescriptions, elbClient)
-		if err != nil {
-			return false, nil
+		lbObjects := []awsObjectWithTags{}
+		for i := 0; i < len(results.LoadBalancerDescriptions); i += 20 {
+			j := i + 20
+			if j > len(results.LoadBalancerDescriptions) {
+				j = len(results.LoadBalancerDescriptions)
+			}
+			new, err := lbToAWSObjects(results.LoadBalancerDescriptions[i:j], elbClient)
+			if err != nil {
+				logger.Errorf("error converting load balancers to internal AWS objects: %v", err)
+				return false, nil
+			}
+			lbObjects = append(lbObjects, new...)
 		}
 
 		filteredResults := filterObjects(lbObjects, filters)