eb_deployer 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14aad1fa4d35f019209b2d9cb3050586b829267f
-  data.tar.gz: 9564952bbde7b1172e4aa6de39c6e89e6391bebf
+  metadata.gz: a1dfbd8d4f385399972ca9ee421f054ea8644ae9
+  data.tar.gz: ff4d16c027d33272e6d6a6fb2a08bb869aa74847
 SHA512:
-  metadata.gz: a20e0b2939902e59bca484b029677035e6c2f63c046ef50eea48bafd739fced95f5c7b941d3b0ab75e232d744107193a3c4e795341fb634a6f163bb02b47371e
-  data.tar.gz: 447edf1d15f8a77f4495832c794e8f98212956bbb4a39a0a7a2c296c50b6bc5653ab927a7a2c86a2f310933832c2e480727f3e8b3136a98e2bb3b83dec22bfee
+  metadata.gz: 46de86d6c03d0e4f8c37578194d8965c78c1a88296c3f28e48f1186ccef65bd52eacbe3153d413d959f4eaacb50be7bb2ad2c0af8cc3bb0c71fddc25c99c1ab6
+  data.tar.gz: e0cad16af0d8a1b3bac871a2a6ac200b10b1ad33ed653abdd3f72d2a99af27725fd7af220fbffefbdb765b4ba63bc95eb5fab4b8e000ec5f94ed4c41ad42fd42

data/lib/eb_deployer/aws_driver/beanstalk.rb

@@ -91,7 +91,7 @@ module EbDeployer
 
       def environment_cname_prefix(app_name, env_name)
         cname = environment_cname(app_name, env_name)
-        if cname =~ /^(.+)\.elasticbeanstalk\.com/
+        if cname =~ /^([^\.]+)(?:\.(?:[a-z0-9\-]+))?\.elasticbeanstalk\.com/i
           $1
         end
       end

data/lib/eb_deployer/version.rb

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

data/test/aws_driver_stubs.rb

@@ -145,7 +145,7 @@ class EBStub
   def environment_cname(app_name, env_name)
     return unless @envs[env_key(app_name, env_name)]
     if cname_prefix = environment_cname_prefix(app_name, env_name)
-      cname_prefix + ".elasticbeanstalk.com"
+      cname_prefix + ".us-west-1.elasticbeanstalk.com"
     end
   end
 

data/test/beanstalk_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class BeanstalkTest < Test::Unit::TestCase
+
+  class StubbedCnameResponder
+    def initialize(stubbed_response)
+      @stubbed_response = stubbed_response
+    end
+
+    def describe_environments(options)
+      {:environments => [@stubbed_response.merge(:status => "online")]}
+    end
+  end
+
+  def test_cname_prefix_will_parse_both_legacy_and_regionalized_domains
+    legacy_domain = "mingle-saas.elasticbeanstalk.com"
+    regionalized_domain = "mingle-saas.us-west-1.elasticbeanstalk.com"
+
+    assert_equal "mingle-saas", EbDeployer::AWSDriver::Beanstalk.new(StubbedCnameResponder.new(:cname => legacy_domain)).environment_cname_prefix("mingle", "saas")
+    assert_equal "mingle-saas", EbDeployer::AWSDriver::Beanstalk.new(StubbedCnameResponder.new(:cname => regionalized_domain)).environment_cname_prefix("mingle", "saas")
+  end
+
+end

data/test/blue_green_deploy_test.rb

@@ -34,9 +34,9 @@ class BlueGreenDeployTest < DeployTest
       do_deploy(version_label, :smoke_test => smoke_test)
     end
 
-    assert_equal ['simple-production.elasticbeanstalk.com',
-                  'simple-production-inactive.elasticbeanstalk.com',
-                  'simple-production-inactive.elasticbeanstalk.com'], smoked_host
+    assert_equal ['simple-production.us-west-1.elasticbeanstalk.com',
+                  'simple-production-inactive.us-west-1.elasticbeanstalk.com',
+                  'simple-production-inactive.us-west-1.elasticbeanstalk.com'], smoked_host
   end
 
   def test_blue_green_deploy_should_blue_green_terminate_inactive_env_if_blue_green_terminate_inactive_is_enabled

data/test/blue_only_deploy_test.rb

@@ -36,9 +36,9 @@ class BlueOnlyDeployTest < DeployTest
       do_deploy(version_label, :smoke_test => smoke_test)
     end
 
-    assert_equal ['simple-production.elasticbeanstalk.com',
-                  'simple-production-inactive.elasticbeanstalk.com',
-                  'simple-production-inactive.elasticbeanstalk.com'], smoked_host
+    assert_equal ['simple-production.us-west-1.elasticbeanstalk.com',
+                  'simple-production-inactive.us-west-1.elasticbeanstalk.com',
+                  'simple-production-inactive.us-west-1.elasticbeanstalk.com'], smoked_host
   end
 
 

data/test/inplace_update_deploy_test.rb

@@ -53,7 +53,7 @@ class InplaceUpdateDeployTest < DeployTest
            :cname_prefix => 'foobar',
            :smoke_test => lambda { |host| host_for_smoke_test = host },
            :version_label => 42)
-    assert_equal 'foobar.elasticbeanstalk.com', host_for_smoke_test
+    assert_equal 'foobar.us-west-1.elasticbeanstalk.com', host_for_smoke_test
 
     host_for_smoke_test = nil
     deploy(:application => 'simple',
@@ -62,7 +62,7 @@ class InplaceUpdateDeployTest < DeployTest
            :smoke_test => lambda { |host| host_for_smoke_test = host },
            :version_label => 43)
 
-    assert_equal 'foobar.elasticbeanstalk.com', host_for_smoke_test
+    assert_equal 'foobar.us-west-1.elasticbeanstalk.com', host_for_smoke_test
   end
 
   def test_should_terminate_old_environment_if_phoenix_mode_is_enabled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - wpc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-19 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -88,6 +88,7 @@ files:
 - lib/generators/eb_deployer/install/templates/ebextensions/01_postgres_packages.config
 - lib/generators/eb_deployer/install/templates/postgres_rds.json
 - test/aws_driver_stubs.rb
+- test/beanstalk_test.rb
 - test/blue_green_deploy_test.rb
 - test/blue_only_deploy_test.rb
 - test/cf_event_poller_test.rb
@@ -132,6 +133,7 @@ summary: Low friction deployments should be a breeze. Elastic Beanstalk provides
   top to automate the whole flow out of the box.
 test_files:
 - test/aws_driver_stubs.rb
+- test/beanstalk_test.rb
 - test/blue_green_deploy_test.rb
 - test/blue_only_deploy_test.rb
 - test/cf_event_poller_test.rb