eb_deployer 0.4.4.beta4 → 0.4.4.beta5

data/lib/eb_deployer.rb

@@ -15,6 +15,7 @@ require 'eb_deployer/deployment_strategy'
 require 'eb_deployer/cloud_formation_provisioner'
 require 'eb_deployer/application'
 require 'eb_deployer/resource_stacks'
+require 'eb_deployer/throttling_handling'
 require 'eb_deployer/eb_environment'
 require 'eb_deployer/environment'
 require 'eb_deployer/default_component'
@@ -175,6 +176,7 @@ module EbDeployer
     bs = opts[:bs_driver] || AWSDriver::Beanstalk.new
     s3 = opts[:s3_driver] || AWSDriver::S3Driver.new
     cf = opts[:cf_driver] || AWSDriver::CloudFormationDriver.new
+
     app_name = opts[:application]
     version_prefix = opts[:version_prefix].to_s.strip
     version_label = "#{version_prefix}#{opts[:version_label].to_s.strip}"
@@ -183,7 +185,7 @@ module EbDeployer
     resource_stacks = ResourceStacks.new(opts[:resources],
                                          cf,
                                          opts[:skip_resource_stack_update])
-
+    bs = ThrottlingHandling.new(bs, AWS::ElasticBeanstalk::Errors::Throttling)
     environment = Environment.new(application, opts[:environment], bs) do |env|
       env.resource_stacks = resource_stacks
       env.settings = opts[:option_settings] || opts[:settings] || []

data/lib/eb_deployer/eb_environment.rb

@@ -41,7 +41,9 @@ module EbDeployer
 
     def swap_cname_with(another)
       log("Swap CNAME with env #{another.name}")
-      @bs.environment_swap_cname(self.app, self.name, another.name)
+      with_polling_events(/Completed swapping CNAMEs for environments/i) do
+        @bs.environment_swap_cname(self.app, self.name, another.name)
+      end
     end
 
     def log(msg)

data/lib/eb_deployer/event_poller.rb

@@ -41,9 +41,7 @@ module EbDeployer
     end
 
     def fetch_events_from_eb(options)
-      backoff(AWS::ElasticBeanstalk::Errors::Throttling) do
-        @eb_driver.fetch_events(@app, @env, options)
-      end
+      @eb_driver.fetch_events(@app, @env, options)
     end
   end
 end

data/lib/eb_deployer/throttling_handling.rb

@@ -0,0 +1,17 @@
+module EbDeployer
+  class ThrottlingHandling
+    include Utils
+
+    def initialize(delegatee, throttling_error)
+      @delegatee = delegatee
+      @throttling_error = throttling_error
+    end
+
+    def method_missing(method, *args, &block)
+      super unless @delegatee.respond_to?(method)
+      backoff(@throttling_error) do
+        @delegatee.send(method, *args, &block)
+      end
+    end
+  end
+end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.4.4.beta4"
+  VERSION = "0.4.4.beta5"
 end

data/test/aws_driver_stubs.rb

@@ -33,7 +33,8 @@ class EBStub
       :version => version,
       :cname_prefix => cname_prefix,
       :tier => tier,
-      :settings => settings}
+      :settings => settings }
+    set_env_ready(app, env, false)
   end
 
   def delete_environment(app, env)
@@ -43,7 +44,9 @@ class EBStub
   end
 
   def update_environment(app, env, version, tier, settings)
+    raise "not in ready state, consider waiting for previous action finish by pulling envents" unless env_ready?(app, env)
     @envs[env_key(app, env)].merge!(:version => version, :settings => settings, :tier => tier)
+    set_env_ready(app, env, false)
   end
 
   def environment_exists?(app_name, env_name)
@@ -79,13 +82,18 @@ class EBStub
   end
 
   def fetch_events(app_name, env_name, options={})
+    set_env_ready(app_name, env_name, true)
+
     unless @events # unrestricted mode for testing if no explicit events set
       return generate_event_from_messages(['Environment update completed successfully',
-                                    'terminateEnvironment completed successfully',
-                                    'Successfully launched environment'])
+                                           'terminateEnvironment completed successfully',
+                                           'Successfully launched environment',
+                                           'Completed swapping CNAMEs for environments'
+                                          ])
     end
 
     @events[env_key(app_name, env_name)]
+    # assume env become ready after it spit out all the events
   end
 
 
@@ -101,10 +109,14 @@ class EBStub
 
 
   def environment_swap_cname(app_name, env1_name, env2_name)
+    raise "#{env1_name} not in ready state, consider to wait for previous action finsish by pulling events" unless env_ready?(app_name, env1_name)
+
     env1, env2 = @envs[env_key(app_name, env1_name)], @envs[env_key(app_name, env2_name)]
     temp = env1[:cname_prefix]
     env1[:cname_prefix] = env2[:cname_prefix]
     env2[:cname_prefix] = temp
+    set_env_ready(app_name, env1_name, false)
+    set_env_ready(app_name, env2_name, false)
   end
 
   def environment_health_state(app_name, env_name)
@@ -116,6 +128,9 @@ class EBStub
   end
 
   #test only
+  def mark_all_envs_ready
+    @envs.values.each { |env| set_env_ready(env[:application], env[:name], true) }
+  end
 
   def environment_tier(app_name, env_name)
     @envs[env_key(app_name, env_name)][:tier]
@@ -149,6 +164,16 @@ class EBStub
 
   private
 
+  def set_env_ready(app, env, ready)
+    if record = @envs[env_key(app, env)]
+      record[:ready] = ready
+    end
+  end
+
+  def env_ready?(app, env)
+    @envs[env_key(app, env)][:ready]
+  end
+
   def generate_event_from_messages(messages)
     [messages.reverse.map do |m|
        {:event_date => Time.now.utc,

data/test/deploy_test.rb

@@ -23,6 +23,7 @@ class DeployTest < MiniTest::Unit::TestCase
   end
 
   def deploy(opts)
+    @eb.mark_all_envs_ready
     EbDeployer.deploy({:package => @sample_package,
                         :strategy => :'inplace-update',
                         :version_label => 1}.merge(opts).merge(stubs))

data/test/inplace_update_deploy_test.rb

@@ -87,7 +87,7 @@ class InplaceUpdateDeployTest < DeployTest
     end
   end
 
-  def test_deploy_should_retry_on_temporary_throttling_error
+  def test_deploy_should_retry_on_temporary_throttling_error_from_fetch_events
     throttling_error = AWS::ElasticBeanstalk::Errors::Throttling.new("bang!")
     error_seq = [throttling_error] * 5
     @eb.set_error_generator(:fetch_events) do
@@ -97,4 +97,14 @@ class InplaceUpdateDeployTest < DeployTest
     assert @eb.environment_exists?('simple', t('production', 'simple'))
   end
 
+  def test_deploy_should_retry_on_temporary_throttling_error_from_create_env
+    throttling_error = AWS::ElasticBeanstalk::Errors::Throttling.new("bang!")
+    error_seq = [throttling_error] * 5
+    @eb.set_error_generator(:create_environment) do
+      error_seq.pop
+    end
+    deploy(:application => 'simple', :environment => "production")
+    assert @eb.environment_exists?('simple', t('production', 'simple'))
+  end
+
 end

data/test/test_helper.rb

@@ -45,7 +45,7 @@ class ErrorRaisingWrapper < SimpleDelegator
       end
 
       def #{method}(*args, &block)
-        if error_gen = @errors[:fetch_events]
+        if error_gen = @errors[:#{method}]
           error = error_gen.call
           raise error if error
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.4.beta4
+  version: 0.4.4.beta5
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -69,6 +69,7 @@ files:
 - lib/eb_deployer/package.rb
 - lib/eb_deployer/resource_stacks.rb
 - lib/eb_deployer/smoke_test.rb
+- lib/eb_deployer/throttling_handling.rb
 - lib/eb_deployer/utils.rb
 - lib/eb_deployer/version.rb
 - lib/eb_deployer/version_cleaner.rb