eb_deployer 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1dfbd8d4f385399972ca9ee421f054ea8644ae9
-  data.tar.gz: ff4d16c027d33272e6d6a6fb2a08bb869aa74847
+  metadata.gz: 8a3bf432fbdd44e7326eaf9e78be738e88e9f3e4
+  data.tar.gz: 2098b1afc36775fde413f58dd89aabd885e12dd3
 SHA512:
-  metadata.gz: 46de86d6c03d0e4f8c37578194d8965c78c1a88296c3f28e48f1186ccef65bd52eacbe3153d413d959f4eaacb50be7bb2ad2c0af8cc3bb0c71fddc25c99c1ab6
-  data.tar.gz: e0cad16af0d8a1b3bac871a2a6ac200b10b1ad33ed653abdd3f72d2a99af27725fd7af220fbffefbdb765b4ba63bc95eb5fab4b8e000ec5f94ed4c41ad42fd42
+  metadata.gz: 1de31e8970e914b8cea087335e455356294144327b4d905b2ad1f5fe28cbfafb62134b1b2408a8178927f7dfd99880aba589d05092a0b0df7cb9b05fae3fac77
+  data.tar.gz: 3faefb2b6faf8ec5caec1ac861828fe95394f81dce54d4ff94b1cec3b02d7275c86872da33e2908f5206ace6868c3b2fa2a56e4f911b48d675709377ad21660a

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
   - 2.1.6
   - 2.2.2
   - jruby-1.7.10
+before_install:
+  - gem install bundler
 script: "bundle exec rake"
 bundler_args: "--without repl documentation"
 branches:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.6.5
+=====
+
+* #66: Making it possible to specify other accepted health states when deploying (@dziemid)
+
+0.6.4
+=====
+
+* fixes #65 - aws driver should be able to detect CNAME prefixes from both regionalized and legacy EB domains
+
 0.6.3
 =====
 

data/eb_deployer.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/eb_deployer/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["wpc", "betarelease"]
+  gem.authors       = ["wpc", "betarelease", "xli"]
   gem.email         = ["alex.hal9000@gmail.com", "sudhindra.r.rao@gmail.com", 'swing1979@gmail.com']
   gem.description   = %q{For automating Blue-Green deployment flows on Elastic Beanstalk.}
   gem.summary       = %q{Low friction deployments should be a breeze. Elastic Beanstalk provides a great foundation for performing Blue-Green deployments, and EbDeployer add a missing top to automate the whole flow out of the box.}

data/lib/eb_deployer.rb

@@ -91,6 +91,11 @@ module EbDeployer
   #   For all available options take a look at
   #   http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options.html
   #
+  # @option opts [Symbol] :accepted_healthy_states (['Green']) If :accepted_healthy_states
+  #   is specified, EBDeployer will accept provided values when checking
+  #   health of an environment instead of default value 'Green'. You can use it
+  #   to specify additional healthy states, for example: ['Green', "Yellow"]
+  #
   # @option opts [Symbol] :phoenix_mode (false) If phoenix mode is turn on, it
   #   will terminate the old elastic beanstalk environment and recreate on
   #   deploy. For blue-green deployment it terminate the inactive environment
@@ -204,6 +209,7 @@ module EbDeployer
         :cname_prefix =>  opts[:cname_prefix],
         :smoke_test => opts[:smoke_test],
         :phoenix_mode => opts[:phoenix_mode],
+        :accepted_healthy_states => opts[:accepted_healthy_states],
         :blue_green_terminate_inactive => opts[:blue_green_terminate_inactive] || false,
         :blue_green_terminate_inactive_wait => opts[:blue_green_terminate_inactive_wait] || 600,
         :blue_green_terminate_inactive_sleep => opts[:blue_green_terminate_inactive_sleep] || 15,

data/lib/eb_deployer/default_config.yml

@@ -83,7 +83,16 @@ common:
       end
     end
 
-
+  # List of Elastic Beanstalk health states that will be considered healthy when deploying.
+  # You may want to override default 'Green' with that list, if for example you are using
+  # Elastic Beanstalk worker tier and you don't want eb_deployer to fail if you have messages
+  # in your SQS queue.
+  # By default eb_deployer only considers 'Green' as the healthy state.
+  # For a list of all Elastic Beanstalk health states refer to:
+  # http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/using-features.healthstatus.html#using-features.healthstatus.colors
+  # accepted_healthy_states:
+  #  - Green
+  #  - Yellow
 
   # Elastic Beanstalk settings that will apply to the environments you are
   # deploying.

data/lib/eb_deployer/eb_environment.rb

@@ -16,6 +16,7 @@ module EbDeployer
       @name = self.class.unique_ebenv_name(name, app)
       @bs = eb_driver
       @creation_opts = default_create_options.merge(reject_nil(creation_opts))
+      @accepted_healthy_states = @creation_opts[:accepted_healthy_states]
     end
 
     def deploy(version_label, settings={})
@@ -162,8 +163,7 @@ module EbDeployer
     def wait_for_env_become_healthy
       Timeout.timeout(600) do
         current_health_status = @bs.environment_health_state(@app, @name)
-
-        while current_health_status != 'Green'
+        while !@accepted_healthy_states.include?(current_health_status)
           log("health status: #{current_health_status}")
           sleep 15
           current_health_status = @bs.environment_health_state(@app, @name)
@@ -181,7 +181,8 @@ module EbDeployer
       {
         :solution_stack => "64bit Amazon Linux 2014.09 v1.1.0 running Tomcat 7 Java 7",
         :smoke_test =>  Proc.new {},
-        :tier => 'WebServer'
+        :tier => 'WebServer',
+        :accepted_healthy_states => ['Green']
       }
     end
 

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/generators/eb_deployer/install/templates/eb_deployer.yml.erb

@@ -89,6 +89,17 @@ common:
       end
     end
 
+  # List of Elastic Beanstalk health states that will be considered healthy when deploying.
+  # You may want to override default 'Green' with that list, if for example you are using
+  # Elastic Beanstalk worker tier and you don't want eb_deployer to fail if you have messages
+  # in your SQS queue.
+  # By default eb_deployer only considers 'Green' as the healthy state.
+  # For a list of all Elastic Beanstalk health states refer to:
+  # http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/using-features.healthstatus.html#using-features.healthstatus.colors
+  # accepted_healthy_states:
+  #  - Green
+  #  - Yellow
+
   # Elastic Beanstalk settings that will apply to the environments you are
   # deploying.
   # For all available options take a look at

data/test/aws_driver_stubs.rb

@@ -7,6 +7,7 @@ class EBStub
     @envs_been_deleted = {}
     @versions_deleted = {}
     @event_fetched_times = 0
+    @envs_health_states = {}
   end
 
   def create_application(app)
@@ -166,7 +167,7 @@ class EBStub
   end
 
   def environment_health_state(app_name, env_name)
-    'Green'
+    @envs_health_states.fetch(app_name+env_name, 'Green')
   end
 
   def environment_verion_label(app_name, env_name)
@@ -178,6 +179,11 @@ class EBStub
   end
 
   #test only
+
+  def mark_env_health_state_as(app_name, env_name, state)
+    @envs_health_states[app_name+env_name] = state
+  end
+
   def mark_all_envs_ready
     @envs.values.each { |env| set_env_ready(env[:application], env[:name], true) }
   end

data/test/eb_environment_test.rb

@@ -99,5 +99,11 @@ class EbEnvironmentTest < Test::Unit::TestCase
     assert_nil @eb_driver.environment_cname_prefix('myapp', t('production', 'myapp'))
   end
 
+  def test_should_be_possible_to_accept_yellow_health_state
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :accepted_healthy_states => ["Green", "Yellow"])
+    @eb_driver.mark_env_health_state_as("myapp", env.name, "Yellow")
+    env.deploy("version1")
+    assert @eb_driver.environment_exists?('myapp', t('production', 'myapp'))
+  end
 
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - wpc
 - betarelease
+- xli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk