eb_deployer 0.4.13 → 0.5.0

data/lib/eb_deployer/aws_driver/beanstalk.rb

@@ -1,6 +1,7 @@
 module EbDeployer
   module AWSDriver
     class Beanstalk
+      include Utils
       attr_reader :client
 
       def initialize(client=AWS::ElasticBeanstalk.new.client)
@@ -41,17 +42,16 @@ module EbDeployer
       end
 
       def create_environment(app_name, env_name, stack_name, cname_prefix, version, tier, tags, settings)
-        request = {
+        request = reject_nil({
           :application_name => app_name,
           :environment_name => env_name,
           :solution_stack_name => stack_name,
           :version_label => version,
           :option_settings => settings,
           :tier => environment_tier(tier),
-          :tags => tags,
-          :cname_prefix => cname_prefix
-        }
-
+          :cname_prefix => cname_prefix,
+          :tags => tags
+        })
         @client.create_environment(request)
       end
 

data/lib/eb_deployer/cloud_formation_provisioner.rb

@@ -30,7 +30,7 @@ module EbDeployer
     def output(key)
       @cf_driver.query_output(@stack_name, key)
     rescue AWS::CloudFormation::Errors::ValidationError => e
-      raise ResourceNotInReadyState.new("Resource stack(#{@stack_name}, key: #{key}) not in ready state yet, perhaps you should provision it first?")
+      raise ResourceNotInReadyState.new("Resource stack not in ready state yet, perhaps you should provision it first?")
     end
 
     private

data/lib/eb_deployer/component.rb

@@ -18,24 +18,26 @@ module EbDeployer
     end
 
     def deploy(version_label, eb_settings, inactive_settings=[])
+      @strategy.test_compatibility(create_options)
       @strategy.deploy(version_label,
                        eb_settings + @component_eb_settings,
                        inactive_settings + @component_inactive_settings)
     end
 
     def new_eb_env(suffix=nil, cname_prefix_overriding=nil)
-      env_name = [@env.name, @name, suffix].compact.join('-')
-      creation_opts = @env.creation_opts.merge(@options)
-      creation_opts = creation_opts.merge(:cname_prefix => cname_prefix_overriding || cname_prefix)
       EbEnvironment.new(@env.app_name,
-                        env_name,
+                        [@env.name, @name, suffix].compact.join('-'),
                         @eb_driver,
-                        creation_opts)
+                        create_options.merge(:cname_prefix => cname_prefix_overriding || cname_prefix))
 
     end
 
     private
 
+    def create_options
+      @env.creation_opts.merge(@options)
+    end
+
     def default_cname_prefix
       [@env.app_name, @env.name, @name].join('-')
     end

data/lib/eb_deployer/default_component.rb

@@ -11,8 +11,8 @@ module EbDeployer
       @creation_opts[:cname_prefix] || default_cname_prefix
     end
 
-
     def deploy(version_label, eb_settings, inactive_settings=[])
+      @strategy.test_compatibility(@creation_opts)
       @strategy.deploy(version_label, eb_settings, inactive_settings)
     end
 

data/lib/eb_deployer/deployment_strategy/blue_green.rb

@@ -5,6 +5,13 @@ module EbDeployer
         @env = env
       end
 
+      def test_compatibility(env_create_options)
+        tier = env_create_options[:tier]
+        if tier && tier.downcase == 'worker'
+          raise "Blue green deployment is not supported for Worker tier"
+        end
+      end
+
       def deploy(version_label, env_settings, inactive_settings=[])
         if !ebenvs.any?(&method(:active_ebenv?))
           ebenv('a', @env.cname_prefix).

data/lib/eb_deployer/deployment_strategy/blue_only.rb

@@ -5,6 +5,13 @@ module EbDeployer
         @env = env
       end
 
+      def test_compatibility(env_create_options)
+        tier = env_create_options[:tier]
+        if tier && tier.downcase == 'worker'
+          raise "Blue only deployment is not supported for Worker tier"
+        end
+      end
+
       def deploy(version_label, env_settings, inactive_settings=[])
         if !ebenvs.any?(&method(:active_ebenv?))
           ebenv('a', @env.cname_prefix).

data/lib/eb_deployer/deployment_strategy/inplace_update.rb

@@ -5,6 +5,9 @@ module EbDeployer
         @env = env
       end
 
+      def test_compatibility(env_create_opts)
+      end
+
       def deploy(version_label, env_settings, inactive_settings)
         @env.new_eb_env.deploy(version_label, env_settings)
       end

data/lib/eb_deployer/eb_environment.rb

@@ -63,18 +63,41 @@ module EbDeployer
 
     private
 
+    def configured_tier
+      @creation_opts[:tier]
+    end
+
+    def has_cname?
+      !configured_tier || configured_tier.downcase == 'webserver'
+    end
+
+    def configured_cname_prefix
+      @creation_opts[:cname_prefix]
+    end
+
     def create_eb_env(settings, version_label)
       solution_stack = @creation_opts[:solution_stack]
       tags = convert_tags_hash_to_array(@creation_opts.delete(:tags))
       validate_solutions_stack(solution_stack)
       with_polling_events(/Successfully launched environment/i) do
-        @bs.create_environment(@app, @name, solution_stack, @creation_opts[:cname_prefix], version_label, @creation_opts[:tier], tags, settings)
+        @bs.create_environment(@app,
+                               @name,
+                               solution_stack,
+                               has_cname? ? configured_cname_prefix : nil,
+                               version_label,
+                               configured_tier,
+                               tags,
+                               settings)
       end
     end
 
     def update_eb_env(settings, version_label)
       with_polling_events(/Environment update completed successfully/i) do
-        @bs.update_environment(@app, @name, version_label, @creation_opts[:tier], settings)
+        @bs.update_environment(@app,
+                               @name,
+                               version_label,
+                               configured_tier,
+                               settings)
       end
     end
 

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.4.13"
+  VERSION = "0.5.0"
 end

data/test/aws_driver_stubs.rb

@@ -139,12 +139,14 @@ class EBStub
 
   def environment_cname_prefix(app_name, env_name)
     return unless @envs[env_key(app_name, env_name)]
-    @envs[env_key(app_name, env_name)][:cname_prefix] || app_name + "-" + SecureRandom.hex
+    @envs[env_key(app_name, env_name)][:cname_prefix]
   end
 
   def environment_cname(app_name, env_name)
     return unless @envs[env_key(app_name, env_name)]
-    environment_cname_prefix(app_name, env_name) + ".elasticbeanstalk.com"
+    if cname_prefix = environment_cname_prefix(app_name, env_name)
+      cname_prefix + ".elasticbeanstalk.com"
+    end
   end
 
 

data/test/eb_environment_test.rb

@@ -7,13 +7,13 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
   end
 
   def test_deploy_should_create_corresponding_eb_env
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     env.deploy("version1")
     assert @eb_driver.environment_exists?('myapp', t('production', 'myapp'))
   end
 
   def test_deploy_again_should_update_environment
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     env.deploy("version1")
     env.deploy("version2")
     assert @eb_driver.environment_exists?('myapp', t('production', 'myapp'))
@@ -21,20 +21,20 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
   end
 
   def test_option_setttings_get_set_on_eb_env
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     env.deploy("version1", {s1: 'v1'})
     assert_equal({s1: 'v1' },  @eb_driver.environment_settings('myapp', t('production', 'myapp')))
   end
 
   def test_deploy_should_include_tags
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, {:tags => {:my_tag => 'my_value', :tag2 => 'value2'}})
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production', :tags => {:my_tag => 'my_value', :tag2 => 'value2'})
     env.deploy("version1")
     assert_equal [{:key => :my_tag, :value => 'my_value'}, {:key => :tag2, :value => 'value2'}], @eb_driver.environment_tags('myapp', t('production', 'myapp'))
   end
 
   def test_should_run_smoke_test_after_deploy
     smoked_host = nil
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :smoke_test => Proc.new { |host| smoked_host = host })
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :smoke_test => Proc.new { |host| smoked_host = host }, :cname_prefix => 'myapp-production')
     env.deploy("version1")
 
     assert !smoked_host.nil?
@@ -42,7 +42,7 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
   end
 
   def test_should_raise_runtime_error_when_deploy_failed
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     @eb_driver.set_events("myapp", t("production", 'myapp'),
                           [],
                           ["start deploying", "Failed to deploy application"])
@@ -50,7 +50,7 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
   end
 
   def test_should_raise_runtime_error_when_eb_extension_execution_failed
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     @eb_driver.set_events("myapp", t("production", 'myapp'),
                           [],
                           ["start deploying",
@@ -62,7 +62,7 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
   end
 
   def test_should_raise_runtime_error_when_issues_during_launch
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     @eb_driver.set_events("myapp", t("production", 'myapp'),
                           [],
                           ["start deploying",
@@ -73,7 +73,7 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
   end
 
   def test_terminate_should_delete_environment
-    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     env.deploy("version1")
     env.terminate
     assert !@eb_driver.environment_exists?('myapp', t('production', 'myapp'))
@@ -81,11 +81,23 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
 
   def test_should_raise_runtime_error_when_solution_stack_is_not_valid
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, {
+                                          :cname_prefix => 'myapp-production',
                                           :solution_stack => "python"
                                         })
     @eb_driver.set_solution_stacks(["java", "ruby"])
     assert_raises(RuntimeError) { env.deploy("version 1") }
   end
 
+  def test_should_no_set_cname_prefix_for_create_unless_for_web_tier
+    env = EbDeployer::EbEnvironment.new("myapp",
+                                        "production",
+                                        @eb_driver,
+                                        :tier => "Worker",
+                                        :cname_prefix => 'myapp-production')
+    env.deploy("version1")
+    assert @eb_driver.environment_exists?('myapp', t('production', 'myapp'))
+    assert_nil @eb_driver.environment_cname_prefix('myapp', t('production', 'myapp'))
+  end
+
 
 end

data/test/multi_components_deploy_test.rb

@@ -135,10 +135,17 @@ class MultiComponentsDeployTest < DeployTest
     do_bg_deploy(settings)
     assert_equal 2, @eb.environment_settings('simple', t('prod-web-a', 'simple')).last[:value]
     assert_equal 1, @eb.environment_settings('simple', t('prod-api-a', 'simple')).last[:value]
-
-
   end
 
+  def test_should_raise_error_when_deploy_work_tier_component_with_blue_green
+    assert_raises(RuntimeError) do
+      deploy(:application => 'simple',
+             :environment => 'prod',
+             :strategy => 'blue-green',
+             :components => [{ 'name' => 'web' },
+                             { 'name' => 'bg', 'tier' => 'worker' }])
+    end
+  end
 
   private
   def do_deploy(options={})

data/test/tier_setting_deploy_test.rb

@@ -10,4 +10,15 @@ class TierSettingDeployTest < DeployTest
     deploy(:application => 'simple', :environment => "production", :tier => 'Worker')
     assert_equal 'Worker', @eb.environment_tier('simple', t('production', 'simple'))
   end
+
+  def test_should_worker_tier_should_not_have_cname_prefix
+    deploy(:application => 'simple', :environment => "production", :tier => 'Worker')
+    assert_nil @eb.environment_cname_prefix('simple', t('production', 'simple'))
+  end
+
+  def test_should_raise_error_when_deploy_worker_tier_with_blue_green
+    assert_raises(RuntimeError) do
+      deploy(:application => 'simple', :environment => "production", :tier => 'Worker', :strategy => 'blue-green')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1