cf_deployer 1.3.6 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6af62f01e593931a2d070b8bf01c2ba1edf70db
-  data.tar.gz: ee8ae861a4e639ee102db4b66d9b927b012b3a98
+  metadata.gz: 99837edd085628d600239c517e9384c05dd2186e
+  data.tar.gz: ff5b6d33be922e3aeaa0f609991f799e0064e623
 SHA512:
-  metadata.gz: 8cb4e81f17e569102839bb18b09ef13e25cf3ad0717410e47ae398afc227a78bb9f8b06eb9db7a8f23aaa9996adbe1db2a6e11650961e1d3e0798922057c091e
-  data.tar.gz: 59d4b6d2031087f1e144c246a89b35c6dd6b13fb195efcbe6418bb177095b3b9a80c1a361fe273b931383958e78845b85a9848da461c91ba19636b5fa2be6969
+  metadata.gz: 7ba8da26ac2cfb06a31fa2acff9ff3fce51c2a2328c79dc6c9542d78b9741d84bf8296e10945eb5a50b631014ae9c9ea8463ee13ab0d2ff6a6ccd7fbd1714941
+  data.tar.gz: 8b18b73a9110ba2d0dbcb953207770e2d83dd92bfcbf72db7a4a7a855f62042ea035141ff7f4a6523871166f8a214c3a594cd8c4d8e8a2f8eb7b9b87ce08308d

data/.gitignore

@@ -27,3 +27,4 @@ config/
 tags
 .rbenv-version
 .ruby-version
+Gemfile.lock

data/ChangeLog.md

@@ -31,3 +31,18 @@ version 1.3.1
 
 version 1.3.2
   - Display details of error message when referenced components do not exist
+
+version 1.3.3
+  - increase default timeout from 900 to 1800
+
+version 1.3.6
+  - explicitly enforce aws-sdk v.1.44.0 as a dependency
+
+version 1.3.7
+  - Increased the number of AWS-SDK retries
+  - Added missing after-update hook to config validation
+  - Added rescue around healthy_instance_count, to prevent intermittent failures from stopping deployment
+
+version 1.3.8
+  - Moved dependencies out of Gemfile and into gemspec
+  - Removed Gemfile.lock

data/Gemfile

@@ -1,11 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in eb_deployer.gemspec
 gemspec
-
-gem 'yard'
-gem 'pry'
-gem 'rspec'
-gem 'rake'
-gem 'rainbow'
-gem 'diffy'

data/cf_deployer.gemspec

@@ -14,6 +14,10 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thor'
   gem.add_runtime_dependency 'rainbow'
   gem.add_runtime_dependency 'diffy'
+  gem.add_development_dependency 'yard', '~> 0.8.7.6'
+  gem.add_development_dependency 'pry', '~> 0.10.1'
+  gem.add_development_dependency 'rspec', '2.14.1'
+  gem.add_development_dependency 'rake', '~> 10.3.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/cf_deployer/config_validation.rb

@@ -6,7 +6,7 @@ module CfDeployer
 
     CommonInputs = [:application, :environment, :component, :region]
     EnvironmentOptions = [:settings, :inputs, :tags, :components]
-    ComponentOptions = [:settings, :inputs, :tags, :'depends-on', :'deployment-strategy', :'before-destroy', :'after-create', :'after-swap', :'defined_outputs', :'defined_parameters', :config_dir, :capabilities, :notify]
+    ComponentOptions = [:settings, :inputs, :tags, :'depends-on', :'deployment-strategy', :'before-destroy', :'after-create', :'after-swap', :'after-update', :'defined_outputs', :'defined_parameters', :config_dir, :capabilities, :notify]
 
     def validate config, validate_inputs = true
       @config = config

data/lib/cf_deployer/driver/auto_scaling_group.rb

@@ -53,11 +53,16 @@ module CfDeployer
       private
 
       def healthy_instance_count
-        count = auto_scaling_instances.count do |instance|
-          instance.health_status == 'HEALTHY' && (load_balancers.empty? || instance_in_service?( instance.ec2_instance ))
+        begin
+          count = auto_scaling_instances.count do |instance|
+            instance.health_status == 'HEALTHY' && (load_balancers.empty? || instance_in_service?( instance.ec2_instance ))
+          end
+          Log.info "Healthy instance count: #{count}"
+          count
+        rescue => e
+          Log.info "Unable to determine healthy instance count due to error: #{e.message}"
+          -1
         end
-        Log.info "Healthy instance count: #{count}"
-        count
       end
 
       def instance_in_service? instance

data/lib/cf_deployer/version.rb

@@ -1,3 +1,3 @@
 module CfDeployer
-  VERSION = "1.3.6"
+  VERSION = "1.3.8"
 end

data/lib/cf_deployer.rb

@@ -38,7 +38,7 @@ require_relative 'cf_deployer/defaults'
 
 module CfDeployer
 
-  AWS.config(:max_retries => 5)
+  AWS.config(:max_retries => 20)
 
   def self.config opts
     config = self.parseconfig opts, false

data/spec/functional/deploy_spec.rb

@@ -33,14 +33,14 @@ describe 'Deploy' do
       allow(CfDeployer::Stack).to receive(:new).with('cf-deployer-sample-cname-swap-dev-web-G', 'web', anything()) { green_stack }
       allow(CfDeployer::Driver::Elb).to receive(:new) { elb_driver }
       allow(CfDeployer::Driver::Route53).to receive(:new) { dns_driver }
-      allow(dns_driver).to receive(:find_alias_target).with('zhao.com', 'test1.zhao.com'){ 'BLUE-elb.zhao.com' }
-      allow(elb_driver).to receive(:find_dns_and_zone_id).with('BLUE-elb') { {:dns_name => 'blue-elb.zhao.com', :canonical_hosted_zone_name_id => 'BLUE111'}}
-      allow(elb_driver).to receive(:find_dns_and_zone_id).with('GREEN-elb') { {:dns_name => 'green-elb.zhao.com', :canonical_hosted_zone_name_id => 'GREEN111'}}
+      allow(dns_driver).to receive(:find_alias_target).with('aws-dev.manheim.com', 'cf-deployer-test.aws-dev.manheim.com'){ 'BLUE-elb.aws-dev.manheim.com' }
+      allow(elb_driver).to receive(:find_dns_and_zone_id).with('BLUE-elb') { {:dns_name => 'blue-elb.aws-dev.manheim.com', :canonical_hosted_zone_name_id => 'BLUE111'}}
+      allow(elb_driver).to receive(:find_dns_and_zone_id).with('GREEN-elb') { {:dns_name => 'green-elb.aws-dev.manheim.com', :canonical_hosted_zone_name_id => 'GREEN111'}}
       allow(CfDeployer::Driver::AutoScalingGroup).to receive(:new).with('blueASG') { blue_asg_driver }
       allow(CfDeployer::Driver::AutoScalingGroup).to receive(:new).with('greenASG') { green_asg_driver }
       allow(green_asg_driver).to receive(:describe) {{desired: 0, min: 0, max: 0}}
       allow(blue_asg_driver).to receive(:describe) {{desired: 2, min: 1, max: 5}}
-      allow(dns_driver).to receive(:set_alias_target).with('zhao.com', 'test1.zhao.com', 'GREEN111', 'green-elb.zhao.com')
+      allow(dns_driver).to receive(:set_alias_target).with('aws-dev.manheim.com', 'cf-deployer-test.aws-dev.manheim.com', 'GREEN111', 'green-elb.aws-dev.manheim.com')
       expect(green_asg_driver).to receive(:warm_up).with(2)
       CfDeployer::CLI.start(['deploy', 'dev', 'web', '-f', 'samples/cname-swap/cf_deployer.yml'])
       expect(green_stack).to be_deleted

data/spec/functional/kill_inactive_spec.rb

@@ -26,7 +26,7 @@ describe 'Kill Inactive' do
       allow(CfDeployer::Stack).to receive(:new).with('cf-deployer-sample-cname-swap-test-web-G', 'web', anything) { green_stack }
       dns_driver = double('route53 driver')
       allow(CfDeployer::Driver::Route53).to receive(:new) { dns_driver }
-      allow(dns_driver).to receive(:find_alias_target).with('zhao.com', 'test1.zhao.com'){ 'BLUE-elb.aws.amazon.com' }
+      allow(dns_driver).to receive(:find_alias_target).with('aws-dev.manheim.com', 'cf-deployer-test.aws-dev.manheim.com'){ 'BLUE-elb.aws.amazon.com' }
 
       CfDeployer::CLI.start(['kill_inactive', 'test', 'web', '-f', 'samples/cname-swap/cf_deployer.yml'])
       expect(green_stack).to be_deleted

data/spec/unit/driver/auto_scaling_group_spec.rb

@@ -57,6 +57,13 @@ describe 'Autoscaling group driver' do
       expect(@driver.send(:healthy_instance_count)).to eql 4
     end
 
+    it 'health check should be resilient against intermittent errors' do
+      instance5 = double('instance5')
+      expect(instance5).to receive(:health_status).and_raise(StandardError)
+      allow(group).to receive(:auto_scaling_instances){ [ instance5 ] }
+      expect(@driver.send(:healthy_instance_count)).to eql -1
+    end
+
     context 'when an elb is associated with the auto scaling group' do
       it 'should not include instances that are HEALTHY but not associated with the elb' do
         instance_collection = double('instance_collection', :health => [{:instance => ec2_instance1, :state => 'InService'}])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf_deployer
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.8
 platform: ruby
 authors:
 - Jame Brechtel
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -83,6 +83,62 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7.6
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.0
 description: For automatic blue green deployment flow on CloudFormation.
 email:
 - jbrechtel@gmail.com
@@ -99,7 +155,6 @@ files:
 - DETAILS.md
 - FAQ.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - QUICKSTART.md
 - README.md

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cf_deployer (1.3.6)
-      aws-sdk (= 1.44.0)
-      diffy
-      log4r
-      rainbow
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aws-sdk (1.44.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    diffy (3.0.6)
-    json (1.8.2)
-    log4r (1.1.10)
-    method_source (0.8.2)
-    mini_portile (0.6.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rainbow (2.0.0)
-    rake (10.3.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    slop (3.5.0)
-    thor (0.19.1)
-    yard (0.8.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  cf_deployer!
-  diffy
-  pry
-  rainbow
-  rake
-  rspec
-  yard