dpl 1.8.17.travis.1402.4 → 1.8.17.travis.1416.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmViNDJlN2QwNDM3MWExODI4ZDU1YWM0NDZmMTUyNzFhOTVmZGM5NQ==
+    OWJkNjc1NjczZGJhMTRjZDAwMDEyOTA4MjYzNzRiNjBlNTUxOThjYQ==
   data.tar.gz: !binary |-
-    MDYwY2U1NTZhYjEyYTk0NGUxOTc5YmRhYTc4YWUzMmI0NzYyYjU5OA==
+    MWVlYjE4ZjNjNTFhNTQxNTFiZGU5ZmU1NzI0M2M4ZmE3ZTY1YmIxNA==
 SHA512:
   metadata.gz: !binary |-
-    NDE4MzEwODc0NDc5NTllYjFkM2RmMTQ0Y2U1MzJhMWM4MzBiMDYzNGMxMGY3
-    YWVkZWJkYzhjNzQ5OTJmYzVlMzkxMzFhZjJkMmU1YjY4ZjA1OTQ1OTk1Yjgx
-    YjZjZDcwMjQxMWY4ZTRjOGFiZjZmM2QzNjc3YzZiOWRiMTVmOGM=
+    NDZlZDdiZmI0OTE0NzljNTkwZmQwZDZhNDY1ZDlkY2ZiNzA1MTdhMTVkNWYx
+    MDhlZjRkN2ZiMTJhMThlNmUxNjA0MTdiMDE0Zjc5YjU2MjFhMDA5MjljN2Nh
+    ZDhkMDE1MTVlMWZkZDM1NWJjZWZhN2MzNTQ3ZmYxMWY2ZjdhN2I=
   data.tar.gz: !binary |-
-    MjE1MDlmYjY1M2I4YmRiYTVmZWE0OTlmZWMwNmVmZGRkZDczNTIyYmNiNDQw
-    OTM3MzRiMDBmYzAyNDZmYWM0OWVjNDY4M2U4OTA5Y2JmM2NhZGMwMjlkMDVm
-    MGZkMzNkNDdmODM2OTk4Mjg1ODI5ZmQyMjQyNjliNWRkMWIxYTE=
+    MDdkYjc0OWQ0ODkzNTE0N2FkZDZhMzQ3NGM4YzI1NzBkNWJiNWY2M2IzM2Y5
+    OWVlMmIyNTU0MDYyZjM3NWE3Y2Y0MDE5MjM2ODFkY2UxY2MxNzUyZTExYzZk
+    ZjA5MTIwNTlhNzNjYTM5ZTUzYTQ2MGVhZTIyZDA1OTAzYmI4YzU=

data/lib/dpl/provider/elastic_beanstalk.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module DPL
   class Provider
     class ElasticBeanstalk < Provider
@@ -32,6 +34,7 @@ module DPL
       end
 
       def push_app
+        @start_time = Time.now
         create_bucket unless bucket_exists?
 
         if options[:zip_file]
@@ -45,6 +48,7 @@ module DPL
         version = create_app_version(s3_object)
         if !only_create_app_version
           update_app(version)
+          wait_until_deployed if options[:wait_until_deployed]
         end
       end
 
@@ -138,6 +142,40 @@ module DPL
         eb.create_application_version(options)
       end
 
+      # Wait until EB environment update finishes
+      def wait_until_deployed
+        errorEvents = 0 # errors counter, should remain 0 for successful deployment
+        events = []
+
+        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)
+              end
+            end
+          end
+
+          break if environment[:status] == "Ready"
+          sleep 5
+        end
+
+        if errorEvents > 0 then error("Deployment failed.") end
+      end
+
       def update_app(version)
         options = {
           :environment_name  => env_name,

data/spec/provider/elastic_beanstalk_spec.rb

@@ -17,6 +17,7 @@ describe DPL::Provider::ElasticBeanstalk do
   let(:bucket_name) { "travis-elasticbeanstalk-test-builds-#{region}" }
   let(:bucket_path) { "some/app"}
   let(:only_create_app_version) { nil }
+  let(:wait_until_deployed) { nil }
 
   let(:bucket_mock) do
     dbl = double("bucket mock", write: nil)
@@ -33,7 +34,8 @@ describe DPL::Provider::ElasticBeanstalk do
     described_class.new(
       DummyContext.new, :access_key_id => access_key_id, :secret_access_key => secret_access_key,
       :region => region, :app => app, :env => env, :bucket_name => bucket_name, :bucket_path => bucket_path,
-      :only_create_app_version => only_create_app_version
+      :only_create_app_version => only_create_app_version,
+      :wait_until_deployed => wait_until_deployed
     )
   end
 
@@ -84,12 +86,12 @@ describe DPL::Provider::ElasticBeanstalk do
 
       provider.push_app
     end
-    
+
     context 'only creates app version' do
       let(:only_create_app_version) { true }
-      
+
       example 'verify the app is not updated' do
-      
+
         expect(provider).to receive(:s3).and_return(s3_mock).twice
         expect(provider).to receive(:create_bucket)
         expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
@@ -121,5 +123,23 @@ describe DPL::Provider::ElasticBeanstalk do
         provider_without_bucket_path.push_app
       end
     end
+
+    context 'When wait_until_deployed option is set' do
+      let(:wait_until_deployed) { true }
+
+      example 'Waits until deployment completes' do
+        expect(provider).to receive(:s3).and_return(s3_mock).twice
+        expect(provider).to receive(:create_bucket)
+        expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
+        expect(provider).to receive(:archive_name).and_return('file.zip')
+        expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
+        expect(provider).to receive(:sleep).with(5)
+        expect(provider).to receive(:create_app_version).with(bucket_mock).and_return(app_version)
+        expect(provider).to receive(:update_app).with(app_version)
+        expect(provider).to receive(:wait_until_deployed)
+
+        provider.push_app
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.17.travis.1402.4
+  version: 1.8.17.travis.1416.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec