eb_deployer 0.3.7 → 0.3.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: adfb84fcb5cfc542a7dbd3634358739b9db48283
+  data.tar.gz: 46dd232647393e435ff65b2cab8ecdfe82de6f54
+SHA512:
+  metadata.gz: d3cc4a4ec8d89f9046ec54d22f95b0d65585b7c3404c2904cd4473180ea945ca868ecef15acc9c57c9b58ef79bfee2d26d8831be8aa08d564188721a59175691
+  data.tar.gz: 0870b0bc37619d8f65837b10820a3ac9cfd64ab84f601f052402a12a4467687f544a624d34996ccedd4c2a5fa399c040ffccbcd44bf765d6392b472e94886e97

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+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.)
+* Add migration logic so that if a ElasticBeanstalk environment with legcy name exists, eb_deployer will automaticly terminate it and replace it with ElasticBeanstalk environment has new name pattern.

data/Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in eb_deployer.gemspec
 gemspec
 
-gem 'redcarpet'
+gem 'redcarpet', :platform => :mri
 gem 'yard'
 gem 'rake'

data/lib/eb_deployer/eb_environment.rb

@@ -3,20 +3,20 @@ module EbDeployer
     attr_reader :app, :name
     attr_writer :event_poller
 
-    def self.unique_ebenv_name(app_name, env_name)
-      raise "Environment name #{env_name} is too long, it must be under 15 chars" if env_name.size > 15
+    def self.legacy_ebenv_name(app_name, env_name)
       digest = Digest::SHA1.hexdigest(app_name + '-' + env_name)[0..6]
       "#{env_name}-#{digest}"
     end
 
-    def initialize(app, env_name, eb_driver, creation_opts={})
+    def initialize(app, name, eb_driver, creation_opts={})
       @app = app
-      @name = self.class.unique_ebenv_name(app, env_name)
+      @name = name
       @bs = eb_driver
       @creation_opts = creation_opts
     end
 
     def deploy(version_label, settings={})
+      terminate_legacy_env
       terminate if @creation_opts[:phoenix_mode]
       create_or_update_env(version_label, settings)
       smoke_test
@@ -41,16 +41,27 @@ module EbDeployer
     end
 
     def terminate
-      if @bs.environment_exists?(@app, @name)
+      terminate_environment(@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
+
+    def terminate_environment(env_name)
+      if @bs.environment_exists?(@app, env_name)
         with_polling_events(/terminateEnvironment completed successfully/i) do
-          @bs.delete_environment(@app, @name)
+          @bs.delete_environment(@app, env_name)
         end
       end
     end
 
-
-    private
-
     def create_or_update_env(version_label, settings)
       if @bs.environment_exists?(@app, @name)
         with_polling_events(/Environment update completed successfully/i) do

data/lib/eb_deployer/version.rb

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

data/test/deploy_test.rb

@@ -36,7 +36,7 @@ class DeployTest < MiniTest::Unit::TestCase
     deploy(:application => 'simple', :environment => "production",
            :option_settings => [redudant])
 
-    assert_equal [redudant], @eb_driver.environment_settings('simple', eb_envname('simple', 'production'))
+    assert_equal [redudant], @eb_driver.environment_settings('simple', 'production')
 
   end
 
@@ -44,35 +44,35 @@ class DeployTest < MiniTest::Unit::TestCase
     deploy(:application => 'simple', :environment => "production")
     destroy(:application => 'simple')
     assert !@eb_driver.application_exists?('simple')
-    assert !@eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
+    assert !@eb_driver.environment_exists?('simple', 'production')
   end
 
   def test_first_deployment_create_environment
-    assert !@eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
+    assert !@eb_driver.environment_exists?('simple', 'production')
     deploy(:application => 'simple', :environment => "production")
-    assert @eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
+    assert @eb_driver.environment_exists?('simple', 'production')
   end
 
   def test_support_very_very_long_app_name
     deploy(:application => 'ver-very-simple-application', :environment => "production")
-    assert @eb_driver.environment_exists?('ver-very-simple-application', eb_envname('ver-very-simple-application', 'production'))
+    assert @eb_driver.environment_exists?('ver-very-simple-application', 'production')
   end
 
   def test_should_raise_error_when_env_name_is_too_long
-    assert_raises(RuntimeError) { deploy(:application => 'simple', :environment => "p" * 16) }
+    assert_raises(RuntimeError) { deploy(:application => 'simple', :environment => "p" * 24) }
   end
 
   def test_update_environment_with_new_version_should_change_version_that_deployed
     deploy(:application => 'simple',
            :environment => "production",
            :version_label => 1)
-    assert_equal '1', @eb_driver.environment_verion_label('simple', eb_envname('simple', 'production'))
+    assert_equal '1', @eb_driver.environment_verion_label('simple', 'production')
 
     deploy(:application => 'simple',
            :environment => "production",
            :version_label => 2)
 
-    assert_equal '2', @eb_driver.environment_verion_label('simple', eb_envname('simple', 'production'))
+    assert_equal '2', @eb_driver.environment_verion_label('simple', 'production')
   end
 
   def test_version_prefix_should_be_prepended_to_version_label
@@ -80,7 +80,7 @@ class DeployTest < MiniTest::Unit::TestCase
            :environment => "production",
            :version_label => 1,
            :version_prefix => "prod-")
-    assert_equal 'prod-1', @eb_driver.environment_verion_label('simple', eb_envname('simple', 'production'))
+    assert_equal 'prod-1', @eb_driver.environment_verion_label('simple', 'production')
   end
 
   def test_should_keep_only_number_of_versions_specified
@@ -128,7 +128,7 @@ class DeployTest < MiniTest::Unit::TestCase
     deploy(:application => 'simple',
            :environment => "production",
            :version_label => 42)
-    assert_equal "simple-production", @eb_driver.environment_cname_prefix('simple', eb_envname('simple', 'production'))
+    assert_equal "simple-production", @eb_driver.environment_cname_prefix('simple', 'production')
   end
 
   def test_cname_prefix_can_be_override
@@ -136,7 +136,7 @@ class DeployTest < MiniTest::Unit::TestCase
            :environment => "production",
            :cname_prefix => 'sports123',
            :version_label => 42)
-    assert_equal "sports123", @eb_driver.environment_cname_prefix('simple', eb_envname('simple', 'production'))
+    assert_equal "sports123", @eb_driver.environment_cname_prefix('simple', 'production')
   end
 
   def test_smoke_test_should_be_run_after_env_created_or_update
@@ -164,8 +164,8 @@ class DeployTest < MiniTest::Unit::TestCase
            :strategy => 'blue-green',
            :version_label => 42)
 
-    assert @eb_driver.environment_exists?('simple', eb_envname('simple', 'production-a'))
-    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', eb_envname('simple', 'production-a'))
+    assert @eb_driver.environment_exists?('simple', 'production-a')
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-a')
   end
 
 
@@ -180,8 +180,8 @@ class DeployTest < MiniTest::Unit::TestCase
            :strategy => 'blue-green',
            :version_label => 43)
 
-    assert @eb_driver.environment_exists?('simple', eb_envname('simple', 'production-a'))
-    assert @eb_driver.environment_exists?('simple', eb_envname('simple', 'production-b'))
+    assert @eb_driver.environment_exists?('simple', 'production-a')
+    assert @eb_driver.environment_exists?('simple', 'production-b')
   end
 
 
@@ -196,9 +196,9 @@ class DeployTest < MiniTest::Unit::TestCase
            :strategy => 'blue-green',
            :version_label => 43)
 
-    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', eb_envname('simple', 'production-a')))
+    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'production-a'))
 
-    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', eb_envname('simple', 'production-b'))
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-b')
 
 
     deploy(:application => 'simple',
@@ -206,9 +206,9 @@ class DeployTest < MiniTest::Unit::TestCase
            :strategy => 'blue-green',
            :version_label => 44)
 
-    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', eb_envname('simple', 'production-b')))
+    assert_match(/simple-production-inactive/,  @eb_driver.environment_cname_prefix('simple', 'production-b'))
 
-    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', eb_envname('simple', 'production-a'))
+    assert_equal 'simple-production',  @eb_driver.environment_cname_prefix('simple', 'production-a')
   end
 
 
@@ -300,7 +300,7 @@ class DeployTest < MiniTest::Unit::TestCase
              }
            })
 
-    assert @eb_driver.environment_settings('simple', eb_envname('simple', 'production')).
+    assert @eb_driver.environment_settings('simple', 'production').
       include?({:namespace => 'aws.foo', :option_name => 'o2', :value => 'transformed value of O2'})
   end
 
@@ -325,7 +325,7 @@ class DeployTest < MiniTest::Unit::TestCase
                'O1' => lambda { |v| {:namespace => 'aws.foo', :option_name => 'o1', :value => v} }
              }
            })
-    assert @eb_driver.environment_settings('simple', eb_envname('simple', 'production')).
+    assert @eb_driver.environment_settings('simple', 'production').
       include?({:namespace => 'aws.foo', :option_name => 'o1', :value => 'value of O1'})
   end
 
@@ -356,10 +356,10 @@ class DeployTest < MiniTest::Unit::TestCase
 
   def test_should_terminate_old_environment_if_phoenix_mode_is_enabled
     deploy(:application => 'simple', :environment => "production", :phoenix_mode => true)
-    assert @eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
+    assert @eb_driver.environment_exists?('simple', 'production')
     deploy(:application => 'simple', :environment => "production", :phoenix_mode => true)
-    assert @eb_driver.environments_been_deleted('simple').include?(eb_envname('simple', 'production'))
-    assert @eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
+    assert @eb_driver.environments_been_deleted('simple').include?('production')
+    assert @eb_driver.environment_exists?('simple', 'production')
   end
 
   def test_blue_green_deployment_should_delete_and_recreate_inactive_env_if_phoenix_mode_is_enabled
@@ -377,7 +377,7 @@ class DeployTest < MiniTest::Unit::TestCase
 
     assert_equal [],  @eb_driver.environments_been_deleted('simple')
 
-    inactive_env = eb_envname('simple', 'production-a')
+    inactive_env = 'production-a'
     assert_match(/inactive/,  @eb_driver.environment_cname_prefix('simple', inactive_env))
 
 
@@ -405,12 +405,12 @@ class DeployTest < MiniTest::Unit::TestCase
 
   def test_sets_default_tier_as_webserver
     deploy(:application => 'simple', :environment => "production")
-    assert_equal EbDeployer.environment_tier('WebServer'), @eb_driver.environment_tier('simple', eb_envname('simple', 'production'))
+    assert_equal EbDeployer.environment_tier('WebServer'), @eb_driver.environment_tier('simple', 'production')
   end
 
   def test_can_change_tier
     deploy(:application => 'simple', :environment => "production", :tier => 'Worker')
-    assert_equal EbDeployer.environment_tier('Worker'), @eb_driver.environment_tier('simple', eb_envname('simple', 'production'))
+    assert_equal EbDeployer.environment_tier('Worker'), @eb_driver.environment_tier('simple', 'production')
   end
 
   def test_should_raise_error_when_tier_setting_is_not_recognized
@@ -432,16 +432,24 @@ class DeployTest < MiniTest::Unit::TestCase
     assert_equal({'s3_bucket' => 'test-bucket', 's3_key' => 'test-mingle.war'}, last_version[:source_bundle])
   end
 
-=begin
-  def test_deploy_with_components
-    deploy(:application => 'simple',
-           :environment => 'production',
-           :components => [{ :name => 'web' }])
+  # def test_deploy_with_components
+  #   deploy(:application => 'simple',
+  #          :environment => 'production',
+  #          :components => [{ :name => 'web' }])
 
-    assert !@eb_driver.environment_exists?('simple', eb_envname('simple', 'production'))
+  #   assert @eb_driver.environment_exists?('simple', 'production-web')
+  # end
 
+  def test_should_clean_up_legacy_environment_on_deploy
+    legacy_env_name = EbDeployer::EbEnvironment.legacy_ebenv_name("simple", "production")
+    @eb_driver.create_application("simple")
+    @eb_driver.create_environment("simple", legacy_env_name, 'solution-stack', 'simple-production', 'foo', 'web' ,{})
+    deploy(:application => 'simple',
+           :environment => 'production',
+           :version_label => 1)
+    assert @eb_driver.environment_exists?("simple", "production")
+    assert !@eb_driver.environment_exists?("simple", legacy_env_name)
   end
-=end
 
   private
 

data/test/eb_environment_test.rb

@@ -27,21 +27,21 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
   def test_deploy_should_create_corresponding_eb_env
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
     env.deploy("version1")
-    assert @eb_driver.environment_exists?('myapp', eb_envname('myapp', 'production'))
+    assert @eb_driver.environment_exists?('myapp', 'production')
   end
 
   def test_deploy_again_should_update_environment
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
     env.deploy("version1")
     env.deploy("version2")
-    assert @eb_driver.environment_exists?('myapp', eb_envname('myapp', 'production'))
-    assert_equal 'version2', @eb_driver.environment_verion_label('myapp', eb_envname('myapp', 'production'))
+    assert @eb_driver.environment_exists?('myapp', 'production')
+    assert_equal 'version2', @eb_driver.environment_verion_label('myapp', 'production')
   end
 
   def test_option_setttings_get_set_on_eb_env
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
     env.deploy("version1", {s1: 'v1'})
-    assert_equal({s1: 'v1' },  @eb_driver.environment_settings('myapp', eb_envname('myapp', 'production')))
+    assert_equal({s1: 'v1' },  @eb_driver.environment_settings('myapp', 'production'))
   end
 
   def test_should_run_smoke_test_after_deploy
@@ -75,7 +75,7 @@ class EbEnvironmentTest < MiniTest::Unit::TestCase
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver)
     env.deploy("version1")
     env.terminate
-    assert !@eb_driver.environment_exists?('myapp', eb_envname('myapp', 'production'))
+    assert !@eb_driver.environment_exists?('myapp', 'production')
   end
 
 

data/test/test_helper.rb

@@ -13,9 +13,4 @@ class MiniTest::Unit::TestCase
     File.open(path, 'w') { |f| f << content }
     path
   end
-
-  def eb_envname(app_name, env_name)
-    EbDeployer::EbEnvironment.unique_ebenv_name(app_name, env_name)
-  end
-
 end

metadata

@@ -1,33 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.3.7
-  prerelease: 
+  version: 0.3.8
 platform: ruby
 authors:
 - wpc
 - betarelease
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 description: For automating Blue-Green deployment flows on Elastic Beanstalk.
 email:
 - alex.hal9000@gmail.com
@@ -41,6 +38,7 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -78,36 +76,27 @@ files:
 homepage: https://github.com/ThoughtWorksStudios/eb_deployer
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1041206842017006108
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1041206842017006108
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.29
-signing_key: 
-specification_version: 3
-summary: 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.
+rubyforge_project:
+rubygems_version: 2.2.1
+signing_key:
+specification_version: 4
+summary: 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.
 test_files:
 - test/aws_driver_stubs.rb
 - test/cloud_formation_provisioner_test.rb
@@ -116,4 +105,4 @@ test_files:
 - test/eb_environment_test.rb
 - test/smoke_test_test.rb
 - test/test_helper.rb
-has_rdoc: 
+has_rdoc: