infopark-aws_utils 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389a880cfba3119750fd2f9e4d2d4e7dad83bf2d
-  data.tar.gz: e94f340162f3f931053a5186a29a5c1d3235c122
+  metadata.gz: '078a203a9cd8bfd2dacafae006a0f6213516b453'
+  data.tar.gz: 54cd52b74fb99e9300bde91bcb8b5fc5c45f3cce
 SHA512:
-  metadata.gz: b3c0d2703181fc994164109b6a0cc877949dba84b7b8b85fd2ff57f82bf2bd3d2ed69d29814df44f8adb0f5a3113b2b9d97fde9e57cce93c3735645c6f131446
-  data.tar.gz: e172b609850d7af87d9f94505343446dcab29297ff0f0c185e97e9fd05e85a6305a2579fde8d02768d7ecc8b2db30308cc46653403c877e93a7212f15e5029d3
+  metadata.gz: 2fe7638fd74cd1f20e0bf87f9ecc459f169fd4897b435cb84d3b9c68f6920b4c1d45766ea9f923fe8b3d86e1267349ab419c27cf3d046917c7e79eeff1a494aa
+  data.tar.gz: 5a9571e4cf734b3a7ebd95df8a84abe0ab344d606fb8f65a40afdf1afa624bd6cb8066784590e0c10ea34535b47e082ea89aa5ab098394f03edc3f79e9e949d7

data/lib/infopark/aws_utils.rb

@@ -7,23 +7,29 @@ module Infopark
 
     class << self
       def gather_all(client, method, **options)
-        @gather_cache ||= {}
-        cache_key = [client, method, options]
-        return @gather_cache[cache_key] if @gather_cache[cache_key]
+        unless block_given?
+          @gather_cache ||= {}
+          cache_key = [client, method, options]
+          return @gather_cache[cache_key] if @gather_cache[cache_key]
+        end
 
         result = []
         loop do
-          response = client.send(method, **options)
+          response = retry_on_throttle { client.send(method, **options) }
           key = (response.members - [:next_token, :failures]).first
           if response.members.include?(:failures) && !response.failures.empty?
             raise "Failed gathering all #{method}: #{response.failures}"
           end
-          result += response[key]
+          if block_given?
+            response[key].each {|entity| retry_on_throttle { yield entity } }
+          else
+            result += response[key]
+          end
           unless options[:next_token] = response.members.include?(:next_token) && response.next_token
             break
           end
         end
-        @gather_cache[cache_key] = result
+        @gather_cache[cache_key] = result unless block_given?
       end
 
       def wait_for(progress, client, waiter, delay: 2, max_attempts: 60, **waiter_params)
@@ -46,6 +52,18 @@ module Infopark
           end
         )
       end
+
+      private
+
+      def retry_on_throttle
+        yield
+      rescue => e
+        if e.class.name =~ /Throttl/
+          sleep 0.1
+          retry
+        end
+        raise
+      end
     end
 
     DEV_ACCOUNT_ID = ENV['INFOPARK_AWS_DEV_ACCOUNT_ID'] || self.local_config['dev_account_id']

data/lib/infopark/aws_utils/version.rb

@@ -1,5 +1,5 @@
 module Infopark
   module AwsUtils
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark-aws_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Tilo Prütz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling