eb_deployer 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: adfb84fcb5cfc542a7dbd3634358739b9db48283
-  data.tar.gz: 46dd232647393e435ff65b2cab8ecdfe82de6f54
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTFkZGMyNGQ3YTg2ZjRjMGM1ZTE0OGIwMDk5ZTQ0ZDgwY2MyMWJhNw==
+  data.tar.gz: !binary |-
+    YmZkZmQ3MTFiZDQ2YjQxMjg4OWM0NWZmMzk3MzZiOTY2YmM5MzdlZQ==
 SHA512:
-  metadata.gz: d3cc4a4ec8d89f9046ec54d22f95b0d65585b7c3404c2904cd4473180ea945ca868ecef15acc9c57c9b58ef79bfee2d26d8831be8aa08d564188721a59175691
-  data.tar.gz: 0870b0bc37619d8f65837b10820a3ac9cfd64ab84f601f052402a12a4467687f544a624d34996ccedd4c2a5fa399c040ffccbcd44bf765d6392b472e94886e97
+  metadata.gz: !binary |-
+    YTAxZjdhNmEwZTcwMjYyNzA2MzY1Zjg5ZDM2ZDhiNmQzN2M1Y2M0Mjk0ZjQy
+    YTczYzEzNDQ1ODAxMTkwOTVlZTc5YmQwZDkxN2JkY2IwNmVmY2U4MWUzMzEx
+    Y2JlMGJjMmI3ZTJiZjQ1OWM5Yzk3NTcyMTdlNmMzMDYyMGY5NjE=
+  data.tar.gz: !binary |-
+    ZTE5MjFiODhmNjA0MjFmNmQyMTJhMmYwMWRiYjM1ODdlNWYyOWMxYzExZTZi
+    OTY1ZmI2ZjkyMjA5ZGM0NTQzMTQ1MTkwZjI3MjY5N2UyOTQyNjRiZTc2OTk3
+    ZWVmNDQxNTcxNDk5ZTljMGE5YjdlMDZiM2M4NmQxMmMxYjVjNDM=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.3.9
+====
+* Fix hang problem introduced in 0.3.8 when migrating old ElasticBeanstalk environment.
+* Fix issue #13 (Deployment via S3 object broken since 0.3.7)
+
 0.3.8
 =====
 * Change ElasticBeanstalk environment name pattern. Stop using sufix hash to make eb environment global unique. (Because ElasticBeanstalk does not require environment has globally uniqe name any more.)

data/lib/eb_deployer/application.rb

@@ -36,7 +36,6 @@ module EbDeployer
 
     def delete(env_name=nil)
       if @eb_driver.application_exists?(@name)
-        env_name = EbEnvironment.unique_ebenv_name(@name, env_name) unless env_name.nil?
         available_envs = @eb_driver.environment_names_for_application(@name)
 
         unless env_name.nil? || available_envs.include?(env_name)

data/lib/eb_deployer/config_loader.rb

@@ -62,6 +62,7 @@ module EbDeployer
 
     def package_digest(package)
       return nil unless package
+      return package unless File.exists?(package)
       Digest::MD5.file(package).hexdigest
     end
   end

data/lib/eb_deployer/deployment_strategy/blue_green.rb

@@ -6,29 +6,29 @@ module EbDeployer
       end
 
       def deploy(version_label, env_settings)
-        if !envs.any?(&method(:active_env?))
-          env('a', @env.cname_prefix).
+        if !ebenvs.any?(&method(:active_ebenv?))
+          ebenv('a', @env.cname_prefix).
             deploy(version_label, env_settings)
           return
         end
 
-        active_env = envs.detect(&method(:active_env?))
-        inactive_env = envs.reject(&method(:active_env?)).first
+        active_ebenv = ebenvs.detect(&method(:active_ebenv?))
+        inactive_ebenv = ebenvs.reject(&method(:active_ebenv?)).first
 
-        inactive_env.deploy(version_label, env_settings)
-        active_env.swap_cname_with(inactive_env)
+        inactive_ebenv.deploy(version_label, env_settings)
+        active_ebenv.swap_cname_with(inactive_ebenv)
       end
 
       private
-      def active_env?(env)
-        env.cname_prefix == @env.cname_prefix
+      def active_ebenv?(ebenv)
+        ebenv.cname_prefix == @env.cname_prefix
       end
 
-      def envs
-        [env('a'), env('b')]
+      def ebenvs
+        [ebenv('a'), ebenv('b')]
       end
 
-      def env(suffix, cname_prefix=nil)
+      def ebenv(suffix, cname_prefix=nil)
         @env.new_eb_env(suffix, cname_prefix || inactive_cname_prefix)
       end
 

data/lib/eb_deployer/eb_environment.rb

@@ -1,6 +1,6 @@
 module EbDeployer
   class EbEnvironment
-    attr_reader :app, :name
+    attr_reader :app, :name, :legacy_env_name
     attr_writer :event_poller
 
     def self.legacy_ebenv_name(app_name, env_name)
@@ -13,6 +13,7 @@ module EbDeployer
       @name = name
       @bs = eb_driver
       @creation_opts = creation_opts
+      @legacy_env_name = self.class.legacy_ebenv_name(@app, @name)
     end
 
     def deploy(version_label, settings={})
@@ -24,16 +25,12 @@ module EbDeployer
     end
 
     def cname_prefix
-      @bs.environment_cname_prefix(@app, @name)
-    end
-
-    def ==(another)
-      self.app == another.app && self.name == another.name
+      @bs.environment_cname_prefix(@app, defactor_env_name)
     end
 
     def swap_cname_with(another)
       log("Swap CNAME with env #{another.name}")
-      @bs.environment_swap_cname(self.app, self.name, another.name)
+      @bs.environment_swap_cname(self.app, self.defactor_env_name, another.defactor_env_name)
     end
 
     def log(msg)
@@ -41,34 +38,37 @@ module EbDeployer
     end
 
     def terminate
-      terminate_environment(@name)
+      env_name = defactor_env_name
+      if @bs.environment_exists?(@app, env_name)
+        with_polling_events(env_name, /terminateEnvironment completed successfully/i) do
+          @bs.delete_environment(@app, env_name)
+        end
+      end
+    end
+
+    def defactor_env_name
+      @bs.environment_exists?(@app, @legacy_env_name) ? @legacy_env_name : @name
     end
 
     private
 
     def terminate_legacy_env
-      legacy_env_name = self.class.legacy_ebenv_name(@app, @name)
-      if @bs.environment_exists?(@app, legacy_env_name)
-        log("Found legacy environment '#{legacy_env_name}', eb_deployer will terminate it and create new environment following new name pattern.")
-        terminate_environment(legacy_env_name)
-      end
-    end
+      if @bs.environment_exists?(@app, @legacy_env_name)
+        log("Found legacy environment '#{@legacy_env_name}', eb_deployer will terminate it and create new environment following new name pattern as '#{@name}'.")
 
-    def terminate_environment(env_name)
-      if @bs.environment_exists?(@app, env_name)
-        with_polling_events(/terminateEnvironment completed successfully/i) do
-          @bs.delete_environment(@app, env_name)
+        with_polling_events(@legacy_env_name, /terminateEnvironment completed successfully/i) do
+          @bs.delete_environment(@app, @legacy_env_name)
         end
       end
     end
 
     def create_or_update_env(version_label, settings)
       if @bs.environment_exists?(@app, @name)
-        with_polling_events(/Environment update completed successfully/i) do
+        with_polling_events(@name, /Environment update completed successfully/i) do
           @bs.update_environment(@app, @name, version_label, @creation_opts[:tier], settings)
         end
       else
-        with_polling_events(/Successfully launched environment/i) do
+        with_polling_events(@name, /Successfully launched environment/i) do
           @bs.create_environment(@app, @name, @creation_opts[:solution_stack], @creation_opts[:cname_prefix], version_label, @creation_opts[:tier], settings)
         end
       end
@@ -79,10 +79,10 @@ module EbDeployer
       SmokeTest.new(@creation_opts[:smoke_test]).run(host_name, self)
     end
 
-    def with_polling_events(terminate_pattern, &block)
+    def with_polling_events(env_name, terminate_pattern, &block)
       event_start_time = Time.now
       yield
-      event_poller.poll(event_start_time) do |event|
+      event_poller.poll(env_name, event_start_time) do |event|
         if event[:message] =~ /Failed to deploy application/
           raise event[:message]
         end
@@ -111,7 +111,7 @@ module EbDeployer
     end
 
     def event_poller
-      @event_poller || EventPoller.new(@app, @name, @bs)
+      @event_poller || EventPoller.new(@app, @bs)
     end
 
 

data/lib/eb_deployer/event_poller.rb

@@ -1,13 +1,13 @@
 module EbDeployer
   class EventPoller
-    def initialize(app, env, beanstalk)
-      @app, @env, @beanstalk = app, env, beanstalk
+    def initialize(app, beanstalk)
+      @app, @beanstalk = app, beanstalk
     end
 
-    def poll(start_time = Time.now, &block)
+    def poll(eb_env_name, start_time = Time.now, &block)
       handled = Set.new
       loop do
-        fetch_events(start_time) do |events|
+        fetch_events(eb_env_name, start_time) do |events|
           new_events = events.reject { |e| handled.include?(digest(e)) }
           handle(new_events, &block)
           handled += new_events.map { |e| digest(e) }
@@ -27,14 +27,14 @@ module EbDeployer
       events.reverse.each(&block)
     end
 
-    def fetch_events(start_time, &block)
-      events, next_token = @beanstalk.fetch_events(@app, @env, :start_time => start_time.iso8601)
+    def fetch_events(eb_env_name, start_time, &block)
+      events, next_token = @beanstalk.fetch_events(@app, eb_env_name, :start_time => start_time.iso8601)
       yield(events)
-      fetch_next(next_token, &block) if next_token
+      fetch_next(eb_env_name, next_token, &block) if next_token
     end
 
-    def fetch_next(next_token, &block)
-      events, next_token = @beanstalk.fetch_events(@app, @env, :next_token => next_token)
+    def fetch_next(eb_env_name, next_token, &block)
+      events, next_token = @beanstalk.fetch_events(@app, eb_env_name, :next_token => next_token)
       yield(events)
       fetch_next(next_token, &block) if next_token
     end

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/lib/eb_deployer.rb

@@ -223,9 +223,10 @@ module EbDeployer
     end
 
     app = opts[:application]
-    bs = opts[:bs_driver] || Beanstalk.new
-    s3 = opts[:s3_driver] || S3Driver.new
-    cf = opts[:cf_driver] || CloudFormationDriver.new
+    bs = opts[:bs_driver] || AWSDriver::Beanstalk.new
+    s3 = opts[:s3_driver] || AWSDriver::S3Driver.new
+    cf = opts[:cf_driver] || AWSDriver::CloudFormationDriver.new
+
     Application.new(app, bs, s3).delete(opts[:environment])
   end
 
@@ -308,6 +309,7 @@ module EbDeployer
         puts "YAML package file format:"
         puts "s3_bucket: <bucket_name>"
         puts "s3_key: <object_path>"
+        exit(0)
       end
     end
   end

data/test/aws_driver_stubs.rb

@@ -1,4 +1,5 @@
 class EBStub
+  attr_reader :envs
   def initialize
     @apps = []
     @envs = {}
@@ -78,16 +79,16 @@ class EBStub
   end
 
   def fetch_events(app_name, env_name, options={})
-    [[{:event_date => Time.now.utc,
-        :message => 'Environment update completed successfully'},
-      {:event_date => Time.now.utc,
-        :message => 'terminateEnvironment completed successfully'},
-      {:event_date => Time.now.utc,
-        :message => 'Successfully launched environment'}
-     ],
-     nil]
+    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'])
+    end
+
+    @events[env_key(app_name, env_name)]
   end
 
+
   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
@@ -140,8 +141,20 @@ class EBStub
     @versions_deleted[app_name]
   end
 
+  def set_events(app_name, env_name, messages)
+    @events ||= {}
+    @events[env_key(app_name, env_name)] = generate_event_from_messages(messages)
+  end
+
   private
 
+  def generate_event_from_messages(messages)
+    [messages.reverse.map do |m|
+       {:event_date => Time.now.utc,
+         :message => m}
+     end, nil]
+  end
+
   def env_key(app, name)
     [app, name].join("-")
   end

data/test/blue_green_deploy_test.rb

@@ -0,0 +1,106 @@
+require 'deploy_test'
+
+class BlueGreenDeployTest < DeployTest
+  def test_blue_green_deployment_strategy_should_create_blue_env_on_first_deployment
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 42)
+
+    assert @eb_driver.environment_exists?('simple', 'production-a')
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-a')
+  end
+
+
+  def test_blue_green_deployment_should_create_green_env_if_blue_exists
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 42)
+
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 43)
+
+    assert @eb_driver.environment_exists?('simple', 'production-a')
+    assert @eb_driver.environment_exists?('simple', 'production-b')
+  end
+
+
+  def test_blue_green_deployment_should_swap_cname_to_make_active_most_recent_updated_env
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 42)
+
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 43)
+
+    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'production-a'))
+
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-b')
+
+
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 44)
+
+    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'production-b'))
+
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-a')
+  end
+
+
+  def test_blue_green_deploy_should_run_smoke_test_before_cname_switch
+    smoked_host = []
+    smoke_test = lambda { |host| smoked_host << host }
+    [42, 43, 44].each do |version_label|
+      deploy(:application => 'simple',
+             :environment => "production",
+             :strategy => 'blue-green',
+             :smoke_test => smoke_test,
+             :version_label => version_label)
+    end
+
+    assert_equal ['simple-production.elasticbeanstalk.com',
+                  'simple-production-inactive.elasticbeanstalk.com',
+                  'simple-production-inactive.elasticbeanstalk.com'], smoked_host
+  end
+
+
+  def test_blue_green_deployment_should_delete_and_recreate_inactive_env_if_phoenix_mode_is_enabled
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 42,
+           :phoenix_mode => true)
+
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 43,
+           :phoenix_mode => true)
+
+    assert_equal [],  @eb_driver.environments_been_deleted('simple')
+
+    inactive_env = 'production-a'
+    assert_match(/inactive/,  @eb_driver.environment_cname_prefix('simple', inactive_env))
+
+
+    deploy(:application => 'simple',
+           :environment => "production",
+           :strategy => 'blue-green',
+           :version_label => 44,
+           :phoenix_mode => true)
+
+    assert_equal [inactive_env], @eb_driver.environments_been_deleted('simple')
+
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', inactive_env)
+  end
+
+
+end

data/test/config_loader_test.rb

@@ -25,6 +25,19 @@ YAML
     assert_equal(nil, config[:common])
   end
 
+  def test_use_package_as_version_label_when_using_s3_obj_as_package
+    config = @loader.load(generate_input(<<-YAML, :package => 'bucket:obj'))
+application: myapp
+common:
+  strategy: inplace-update
+environments:
+  dev:
+YAML
+    assert_equal('myapp', config[:application])
+    assert_equal('bucket:obj', config[:package])
+    assert_equal('bucket:obj', config[:version_label])
+  end
+
   def test_common_settings_get_merge_into_the_config
     config = @loader.load(generate_input(<<-YAML))
 application: myapp