dpl-elastic_beanstalk 1.10.8.travis.3236.5 → 1.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e49e7b58fffcfc9183a6a7db84cd3cbd94dbe17c0fe16b437d6bddddc763bed
-  data.tar.gz: 3752ba5405dbc0434aed1a86bf6b91af7a382bcb480d09e2a90525044a9185ad
+  metadata.gz: 88b5d0e19901ec4b0066bb3de498f26f117f969cde5ebea489c3dd5f8cb9b75b
+  data.tar.gz: bf6f805b75a962d47625059267bb2850068337d45f71a53fdb73772103ab56d0
 SHA512:
-  metadata.gz: 277eb69ad218b6f96c18a955722832026a573497c0c23d2db723e21bfaaae6611c35c603d7c65a1580c6833d4f9387cd7fffca92a721acdd5095441539724d39
-  data.tar.gz: cf7d573e256370701b22e4490b0c6d3f6ea0a15a266e543138f6a1f41bc49bc1d99cd62adf42e2567ee2acef0e12d9105580382197c920d6697c21d140ebdc16
+  metadata.gz: 7edd626c8bf6a29ff36a94bbdc7a7304d791e6f42e9a9d248651446dd47953f740960bc03addad0d69c6fa9e643680970f6c161a857e33751547340fafd12c4e
+  data.tar.gz: 0cfeca389a77b777e62f8f43a19d8aafda3eb1e2c53a8d38813fed76424a19470c66b0fc3480ab7e512d53664c031a34e172a62e866c82b4bda164e7e07f7838

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -152,31 +152,45 @@ module DPL
       def wait_until_deployed
         errorEvents = 0 # errors counter, should remain 0 for successful deployment
         events = []
+        tries = 0
+        max_tries = 10
 
         loop do
-          environment = eb.describe_environments({
-            :application_name  => app_name,
-            :environment_names => [env_name]
-          })[:environments].first
-
-          eb.describe_events({
-            :environment_name  => env_name,
-            :start_time        => @start_time.utc.iso8601,
-          })[:events].reverse.each do |event|
-            message = "#{event[:event_date]} [#{event[:severity]}] #{event[:message]}"
-            unless events.include?(message)
-              events.push(message)
-              if event[:severity] == "ERROR"
-                errorEvents += 1
-                warn(message)
-              else
-                log(message)
+          if tries >= max_tries
+            log "Too many failures"
+            break
+          end
+          
+          begin
+            environment = eb.describe_environments({
+              :application_name  => app_name,
+              :environment_names => [env_name]
+            })[:environments].first
+
+            eb.describe_events({
+              :environment_name  => env_name,
+              :start_time        => @start_time.utc.iso8601,
+            })[:events].reverse.each do |event|
+              message = "#{event[:event_date]} [#{event[:severity]}] #{event[:message]}"
+              unless events.include?(message)
+                events.push(message)
+                if event[:severity] == "ERROR"
+                  errorEvents += 1
+                  warn(message)
+                else
+                  log(message)
+                end
               end
             end
-          end
 
-          break if environment[:status] == "Ready"
-          sleep 5
+            break if environment[:status] == "Ready"
+            sleep 5
+          rescue Aws::Errors::ServiceError => e
+            log "Caught #{e}: #{e.message}"
+            log "Continuing..."
+          ensure
+            tries += 1
+          end
         end
 
         if errorEvents > 0 then error("Deployment failed.") end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module DPL
-  VERSION = '1.10.8.travis.3236.5'
+  VERSION = '1.10.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-elastic_beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.10.8.travis.3236.5
+  version: 1.10.8
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.8.travis.3236.5
+        version: 1.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.8.travis.3236.5
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -203,12 +203,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files: []
+test_files:
+- spec/provider/elastic_beanstalk_spec.rb