eb_deployer 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61bce2cf3c9e823994645f76257fe43b360f3dfa
-  data.tar.gz: 0446b95ef9b12a138b495fd847118981c22452cf
+  metadata.gz: 289171f2547c967c1eae9bc6d0f563dc21f22171
+  data.tar.gz: 45b726f54907a691b25bf9c7d988cef95033ad9f
 SHA512:
-  metadata.gz: 86ab2af9a6e5beaa906486a9929f75914a4f425169d39dd32c077ea63310951ea7c83ca93ff4e3c7aec11fe4bcf00b7ee5b0e5675bc1b01175776eaa6021d8ee
-  data.tar.gz: a699f697841d6e07c2d1b0ee7b682d65431f2d24b1e26a4602e7bb72303eead2866ce9e7014e7652052005a9b30d151481c4909f290e2d97e9b8f63f16777d53
+  metadata.gz: 56223ac7b25c78454895e56da1c8d2ffbb1f472fcdf33410630a3ad5e7ca67c001c22974a5633a958ececaa114bca3972925e03b1c023749d7e2792c0795cfda
+  data.tar.gz: d4adf02b72603f9ce2ee50cd7fa48ad8736c3d659a4426bee6476a9053a0522cc5548f8f51838966a4c5b34d86fd093f84fd65296bb2ceed3bd12bb3fa74c3df

data/CHANGELOG.md

@@ -1,8 +1,18 @@
+0.7.0
+=====
+
+* Add service specific AWS sdk gems
+* [#79](https://github.com/ThoughtWorksStudios/eb_deployer/pull/79): Environment updates can complete with errors
+* [#82](https://github.com/ThoughtWorksStudios/eb_deployer/pull/82): Added a line to force STDOUT output every line
+* [#85](https://github.com/ThoughtWorksStudios/eb_deployer/pull/85): Improve package not found error message
+* [#86](https://github.com/ThoughtWorksStudios/eb_deployer/pull/86): Fix to for inactive stack updates when instances are 0
+ 
 0.6.6
 =====
 
-* Add support for specifying (and overriding) a [stack policy](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/protect-stack-resources.html) for the CloudFormation resource stack
-* Fix issue where deployment hangs if resource stack update fails and stack is rolled back, deployment will now fail when the resource stack update fails
+* Add support for specifying (and overriding) a [stack policy](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/protect-stack-resources.html) for the CloudFormation resource stack. (contributed by @jlabrecque)
+* Fix issue where deployment hangs if resource stack update fails and stack is rolled back, deployment will now fail when the resource stack update fails. (contributed by @jlabrecque)
+* Add support for creating environment base on a elasticbeanstalk template. (contributed by @djpate)
 
 0.6.5
 =====

data/Gemfile

@@ -6,5 +6,5 @@ gemspec
 gem 'redcarpet', :platform => :mri
 gem 'yard'
 gem 'rake'
-gem 'railties'
+gem 'railties', '~> 4.1'
 gem 'test-unit'

data/bin/eb_deploy

@@ -7,5 +7,7 @@ if File.exists?(git_path)
   $:.unshift(lib_path)
 end
 
+STDOUT.sync = true # Forces output after every line.
+
 require 'eb_deployer'
-EbDeployer.cli
+EbDeployer.cli

data/eb_deployer.gemspec

@@ -9,7 +9,9 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/ThoughtWorksStudios/eb_deployer"
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'aws-sdk', '~> 2',  '>= 2.0.0'
+  gem.add_runtime_dependency 'aws-sdk-cloudformation',  '~> 1.4', '>= 1.4.0'
+  gem.add_runtime_dependency 'aws-sdk-elasticbeanstalk',  '~> 1.5', '~> 1.5.0'
+  gem.add_runtime_dependency 'aws-sdk-s3',  '~> 1', '~> 1.0.0'
 
   gem.files         = `git ls-files`.split($\).reject {|f| f =~ /^samples\// }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/eb_deployer.rb

@@ -3,7 +3,9 @@ require 'set'
 require 'time'
 require 'json'
 require 'timeout'
-require 'aws-sdk'
+require 'aws-sdk-s3'
+require 'aws-sdk-elasticbeanstalk'
+require 'aws-sdk-cloudformation'
 require 'optparse'
 require 'erb'
 require 'fileutils'
@@ -242,7 +244,6 @@ module EbDeployer
     app = opts[:application]
     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
@@ -316,7 +317,6 @@ module EbDeployer
 
       opts.on("--debug", "Output AWS debug log") do |d|
         require 'logger'
-        require 'aws-sdk'
         logger = Logger.new($stdout)
         logger.level = Logger::DEBUG
         Aws.config.update(:logger => logger)

data/lib/eb_deployer/application.rb

@@ -14,7 +14,7 @@ module EbDeployer
     def create_version(version_label, package)
       create_application_if_not_exists
 
-      source_bundle = if File.exists?(package)
+      source_bundle = if File.exist?(package)
                         if File.extname(package) == '.yml'
                           YAML.load(File.read(package))
                         else
@@ -26,7 +26,7 @@ module EbDeployer
                         bucket, obj_key = package.split(':')
                         {'s3_bucket' => bucket, 's3_key' => obj_key}
                       else
-                        raise "Unknown package file/format: #{package.inspect}"
+                        raise "Neither the file exists nor it is a valid s3 url: #{package.inspect}"
                       end
 
       unless @eb_driver.application_version_labels(@name).include?(version_label)

data/lib/eb_deployer/config_loader.rb

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

data/lib/eb_deployer/deployment_strategy/blue_only.rb

@@ -19,7 +19,6 @@ module EbDeployer
           return
         end
 
-        active_ebenv = ebenvs.detect(&method(:active_ebenv?))
         inactive_ebenv = ebenvs.reject(&method(:active_ebenv?)).first
 
         inactive_ebenv.deploy(version_label, env_settings)

data/lib/eb_deployer/eb_environment.rb

@@ -17,6 +17,7 @@ module EbDeployer
       @bs = eb_driver
       @creation_opts = default_create_options.merge(reject_nil(creation_opts))
       @accepted_healthy_states = @creation_opts[:accepted_healthy_states]
+      @event_poller = nil
     end
 
     def deploy(version_label, settings={})
@@ -35,7 +36,7 @@ module EbDeployer
     def apply_settings(settings)
       raise "Env #{self.name} not exists for applying settings" unless @bs.environment_exists?(@app, @name)
       wait_for_env_status_to_be_ready
-      with_polling_events(/Environment update completed successfully/i) do
+      with_polling_events(/Successfully deployed new configuration to environment/i) do
         @bs.update_environment_settings(@app, @name, settings)
       end
     end
@@ -103,7 +104,7 @@ module EbDeployer
     end
 
     def update_eb_env(settings, version_label)
-      with_polling_events(/Environment update completed successfully/i) do
+      with_polling_events(/Successfully deployed new configuration to environment/i) do
         @bs.update_environment(@app,
                                @name,
                                version_label,
@@ -135,6 +136,10 @@ module EbDeployer
           raise "Elasticbeanstalk instance provision failed (maybe a problem with your .ebextension files). The original message: #{event[:message]}"
         end
 
+        if event[:message] =~ /complete, but with errors/
+          raise event[:message]
+        end
+
         if event[:message] =~ /However, there were issues during launch\. See event log for details\./
           raise "Environment launched, but with errors.  The original message: #{event[:message]}"
         end

data/lib/eb_deployer/environment.rb

@@ -3,7 +3,7 @@ module EbDeployer
     include Utils
     attr_accessor :creation_opts, :strategy_name
 
-    attr_writer :resource_stacks, :settings, :inactive_settings, :components, :component_under_deploy
+    attr_writer :resource_stacks, :settings, :inactive_settings, :component_under_deploy
 
     attr_reader :name
 
@@ -16,6 +16,7 @@ module EbDeployer
       @settings = []
       @inactive_settings = []
       @strategy_name = :blue_green
+      @components = nil
       yield(self) if block_given?
       unless @components
         @components = [DefaultComponent.new(self, @creation_opts, @strategy_name, @eb_driver)]

data/lib/eb_deployer/version.rb

@@ -1,3 +1,3 @@
 module EbDeployer
-  VERSION = "0.6.6"
+  VERSION = "0.7.0"
 end

data/lib/eb_deployer/version_cleaner.rb

@@ -19,7 +19,7 @@ module EbDeployer
       end
 
       all_versions.sort! { |x, y| y[:date_updated] <=> x[:date_updated] }
-      versions_to_keep = all_versions.slice!(range_to_keep)
+      all_versions.slice!(range_to_keep)
       all_versions.map { |apv| apv[:version] }
     end
 

data/lib/generators/eb_deployer/install/install_generator.rb

@@ -1,6 +1,6 @@
 require 'rails/generators'
 require 'eb_deployer/default_config'
-require 'aws-sdk'
+require 'aws-sdk-elasticbeanstalk'
 require 'securerandom'
 
 module EbDeployer

data/test/aws_driver_stubs.rb

@@ -8,6 +8,7 @@ class EBStub
     @versions_deleted = {}
     @event_fetched_times = 0
     @envs_health_states = {}
+    @events = nil
   end
 
   def create_application(app)
@@ -25,7 +26,7 @@ class EBStub
   end
 
   def create_environment(app, env, solution_stack, cname_prefix, version, tier, tags, settings, template_name)
-    raise 'cname prefix is not avaible' if @envs.values.detect { |env| env[:cname_prefix] == cname_prefix }
+    raise 'cname prefix is not avaible' if @envs.values.detect { |value| value[:cname_prefix] == cname_prefix }
     raise "env name #{env} is longer than 23 chars" if env.size > 23
     raise "app not exists" unless application_exists?(app)
     @envs[env_key(app, env)] = {
@@ -98,7 +99,7 @@ class EBStub
     set_env_ready(app_name, env_name, true) # assume env become ready after it spit out all the events
 
     unless @events # unrestricted mode for testing if no explicit events set
-      return [generate_event_from_messages(['Environment update completed successfully',
+      return [generate_event_from_messages(['Successfully deployed new configuration to environment',
                                            'terminateEnvironment completed successfully',
                                            'Successfully launched environment',
                                            'Completed swapping CNAMEs for environments'
@@ -176,7 +177,7 @@ class EBStub
   end
 
   def list_solution_stack_names
-    @solution_stacks || ["64bit Amazon Linux 2014.09 v1.1.0 running Tomcat 7 Java 7"]
+    ["64bit Amazon Linux 2014.09 v1.1.0 running Tomcat 7 Java 7"]
   end
 
   #test only
@@ -207,7 +208,7 @@ class EBStub
 
   def environment_names_for_application(app)
     @envs.inject([]) do |memo, pair|
-      key, env = pair
+      _, env = pair
       memo << env[:name] if env[:application] == app
       memo
     end
@@ -340,10 +341,10 @@ class CFStub
 
   def generate_event_from_messages(stack, messages)
     messages.map do |message|
-      event = OpenStruct.new(timestamp: Time.now,
-                             resource_type: 'AWS::CloudFormation::Stack',
-                             logical_resource_id: stack,
-                             resource_status: message)
+      OpenStruct.new(timestamp: Time.now,
+                     resource_type: 'AWS::CloudFormation::Stack',
+                     logical_resource_id: stack,
+                     resource_status: message)
     end.reverse
   end
 end

data/test/eb_environment_test.rb

@@ -61,6 +61,17 @@ class EbEnvironmentTest < Test::Unit::TestCase
     assert_raises(RuntimeError) { env.deploy("version 1") }
   end
 
+  def test_should_raise_runtime_error_when_issues_during_environment_update
+    env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
+    @eb_driver.set_events("myapp", t("production", 'myapp'),
+                          [],
+                          ["start deploying",
+                           "create environment",
+                           "Update environment operation is complete, but with errors. For more information, see troubleshooting documentation."])
+
+    assert_raises(RuntimeError) { env.deploy("version 1") }
+  end
+
   def test_should_raise_runtime_error_when_issues_during_launch
     env = EbDeployer::EbEnvironment.new("myapp", "production", @eb_driver, :cname_prefix => 'myapp-production')
     @eb_driver.set_events("myapp", t("production", 'myapp'),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eb_deployer
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - wpc
@@ -10,28 +10,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-elasticbeanstalk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: For automating Blue-Green deployment flows on Elastic Beanstalk.
 email:
 - alex.hal9000@gmail.com
@@ -153,4 +193,3 @@ test_files:
 - test/test_helper.rb
 - test/tier_setting_deploy_test.rb
 - test/versions_deploy_test.rb
-has_rdoc: