cf_deployer 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ff8335edd7be5ca468d0a45f6cf614f401cbdce
-  data.tar.gz: ceecfb7632c801761d0b655f87a147ce181dfd1f
+  metadata.gz: 6f550eef2ccbd8df2bff3ad4441d228800bab756
+  data.tar.gz: f3981f2ef12ab4338ddb5bec47fc31c6326e2582
 SHA512:
-  metadata.gz: 330695b0672d8af04459a26eb04973cf11e3f95415d453743fb9fed6d269530633bb876d37527e366b990d3980628c3778db8715cfbf9ac40e00eae35b6fecfc
-  data.tar.gz: 7416a2d5697ef2d66fcd89b556c1adb902e299f4acfa84c36746c51694d775b8898b39d751485cd50e73666f79e08e79d09f6a37331922809468ef1e09630fb7
+  metadata.gz: 0d09d5100924380dd8643c041bdd188b6d53fd3a2b408a4a7609ce785fc935149dc37a39d2b192c9003651cc695f1757c8014134bcbe930f679c4648691e3a78
+  data.tar.gz: 93e9e12ece59c4a0a01508047be7da243977770b82ed8d1d844f1eea81c8b98b3875e942db5e88231ed4716db1004f8c87baca255fd9a61d3a02f24b9b79a0d6

data/ChangeLog.md

@@ -54,3 +54,6 @@ version 1.4.0
   - Merge settings from parent component when given (https://github.com/manheim/cf_deployer/pull/37)
   - Added support for stack policies (https://github.com/manheim/cf_deployer/pull/40)
   - Fix broken Travis builds with newer version of bundler (https://github.com/manheim/cf_deployer/pull/42)
+
+version 1.5.0
+  - Treat deployments that end in a rollback as a failure

data/lib/cf_deployer/driver/cloud_formation_driver.rb

@@ -21,13 +21,17 @@ module CfDeployer
           CfDeployer::Driver::DryRun.guard "Skipping update_stack" do
             aws_stack.update opts.merge(:template => template)
           end
+
         rescue AWS::CloudFormation::Errors::ValidationError => e
           if e.message =~ /No updates are to be performed/
             Log.info e.message
+            return false
           else
             raise
           end
         end
+
+        return !CfDeployer::Driver::DryRun.enabled?
       end
 
       def stack_status

data/lib/cf_deployer/driver/dry_run.rb

@@ -4,6 +4,30 @@ module CfDeployer
 
       @@enabled = false
 
+      def self.enabled?
+        @@enabled
+      end
+
+      def self.run_with_value value, &block
+        previous_value = @@enabled
+        @@enabled = value
+        begin
+          block.call
+        rescue => e
+          raise e
+        ensure
+          @@enabled = previous_value
+        end
+      end
+
+      def self.enable_for &block
+        run_with_value(true, &block)
+      end
+
+      def self.disable_for &block
+        run_with_value(false, &block)
+      end
+
       def self.enable
         CfDeployer::Log.info "Enabling Dry-Run Mode"
         @@enabled = true

data/lib/cf_deployer/stack.rb

@@ -3,9 +3,9 @@ module CfDeployer
   end
 
   class Stack
-    SUCCESS_STATS = [:create_complete, :update_complete, :update_rollback_complete, :delete_complete]
+    SUCCESS_STATS = [:create_complete, :update_complete, :delete_complete]
     READY_STATS = SUCCESS_STATS - [:delete_complete]
-    FAILED_STATS = [:create_failed, :update_failed, :delete_failed]
+    FAILED_STATS = [:create_failed, :update_failed, :delete_failed, :update_rollback_complete]
 
 
     def initialize(stack_name, component, context)
@@ -127,8 +127,8 @@ module CfDeployer
       unless override_policy_json.nil?
         args[:stack_policy_during_update_body] = override_policy_json
       end
-      @cf_driver.update_stack(template, args)
-      wait_for_stack_op_terminate
+      stack_updated = @cf_driver.update_stack(template, args)
+      wait_for_stack_op_terminate if stack_updated
     end
 
     def create_stack(template, params, capabilities, tags, notify, create_policy_json)

data/lib/cf_deployer/version.rb

@@ -1,3 +1,3 @@
 module CfDeployer
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/unit/driver/cloud_formation_spec.rb

@@ -42,6 +42,54 @@ describe 'CloudFormation' do
     CfDeployer::Driver::CloudFormation.new('testStack').parameters.should eq(parameters)
   end
 
+  context 'update_stack' do
+    it 'skips the stack update if dry run is enabled' do
+      cloud_formation = CfDeployer::Driver::CloudFormation.new 'my_stack'
+      expect(cloud_formation).to receive(:aws_stack).never
+
+      CfDeployer::Driver::DryRun.enable_for do
+        cloud_formation.update_stack :template, {}
+      end
+    end
+
+    it 'returns false if no updates were performed (because of dry run)' do
+      cloud_formation = CfDeployer::Driver::CloudFormation.new 'my_stack'
+      result = nil
+
+      CfDeployer::Driver::DryRun.enable_for do
+        result = cloud_formation.update_stack :template, {}
+      end
+
+      expect(result).to be_false
+    end
+
+    it 'returns false if no updates were performed (because no difference in template)' do
+      cloud_formation = CfDeployer::Driver::CloudFormation.new 'my_stack'
+      expect(cloud_formation).to receive(:aws_stack).and_raise(AWS::CloudFormation::Errors::ValidationError.new('No updates are to be performed'))
+      result = nil
+
+      CfDeployer::Driver::DryRun.disable_for do
+        result = cloud_formation.update_stack :template, {}
+      end
+
+      expect(result).to be_false
+    end
+
+    it 'returns true when updates are performed' do
+      cloud_formation = CfDeployer::Driver::CloudFormation.new 'my_stack'
+      aws_stack = double(:update => :did_something)
+      expect(cloud_formation).to receive(:aws_stack).and_return aws_stack
+      result = nil
+
+      CfDeployer::Driver::DryRun.disable_for do
+        result = cloud_formation.update_stack :template, {}
+      end
+
+      expect(result).to be_true
+    end
+
+  end
+
   context 'resource_statuses' do
     it 'should get resource statuses' do
       expected = {

data/spec/unit/driver/dry_run_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe 'DryRun' do
+
+  context 'enable_for' do
+    it 'enables dry run only during the block given' do
+      CfDeployer::Driver::DryRun.disable_for do
+        enabled_in_block = false
+
+        CfDeployer::Driver::DryRun.enable_for do
+          enabled_in_block = CfDeployer::Driver::DryRun.enabled?
+        end
+
+        expect(enabled_in_block).to be_true
+        expect(CfDeployer::Driver::DryRun.enabled?).to be_false
+      end
+    end
+
+    it 'resets dry run, even if the given block throws an exception' do
+      CfDeployer::Driver::DryRun.disable_for do
+        enabled_in_block = false
+
+        expect do
+          CfDeployer::Driver::DryRun.enable_for do
+            enabled_in_block = CfDeployer::Driver::DryRun.enabled?
+            raise 'boom'
+          end
+        end.to raise_error('boom')
+
+        expect(enabled_in_block).to be_true
+        expect(CfDeployer::Driver::DryRun.enabled?).to be_false
+      end
+    end
+  end
+
+  context 'disable_for' do
+    it 'disables dry run only during the block given' do
+      CfDeployer::Driver::DryRun.enable_for do
+        enabled_in_block = nil
+
+        CfDeployer::Driver::DryRun.disable_for do
+          enabled_in_block = CfDeployer::Driver::DryRun.enabled?
+        end
+
+        expect(enabled_in_block).to be_false
+        expect(CfDeployer::Driver::DryRun.enabled?).to be_true
+      end
+    end
+
+    it 'resets dry run, even if the given block throws an exception' do
+      CfDeployer::Driver::DryRun.enable_for do
+        enabled_in_block = nil
+
+        expect do
+          CfDeployer::Driver::DryRun.disable_for do
+            enabled_in_block = CfDeployer::Driver::DryRun.enabled?
+            raise 'boom'
+          end
+        end.to raise_error('boom')
+
+        expect(enabled_in_block).to be_false
+        expect(CfDeployer::Driver::DryRun.enabled?).to be_true
+      end
+    end
+  end
+end

data/spec/unit/stack_spec.rb

@@ -72,6 +72,50 @@ describe CfDeployer::Stack do
       stack.deploy
     end
 
+    it 'waits for result when stack is updated' do
+      template = { :resources => {}}
+      allow(CfDeployer::ConfigLoader).to receive(:erb_to_json).with('web', @config).and_return(template)
+      allow(@cf_driver).to receive(:stack_exists?) { true }
+      allow(@cf_driver).to receive(:stack_status) { :create_complete }
+      expected_opt = {
+        :capabilities => [],
+        :parameters => {:foo => 'bar'}
+      }
+      expect(@cf_driver).to receive(:update_stack).with(template, expected_opt).and_return(true)
+      stack = CfDeployer::Stack.new('test','web', @config)
+      expect(stack).to receive(:wait_for_stack_op_terminate)
+      stack.deploy
+    end
+
+    it 'does not wait for result when stack is not updated' do
+      template = { :resources => {}}
+      allow(CfDeployer::ConfigLoader).to receive(:erb_to_json).with('web', @config).and_return(template)
+      allow(@cf_driver).to receive(:stack_exists?) { true }
+      allow(@cf_driver).to receive(:stack_status) { :create_complete }
+      expected_opt = {
+        :capabilities => [],
+        :parameters => {:foo => 'bar'}
+      }
+      expect(@cf_driver).to receive(:update_stack).with(template, expected_opt).and_return(false)
+      stack = CfDeployer::Stack.new('test','web', @config)
+      expect(stack).to_not receive(:wait_for_stack_op_terminate)
+      stack.deploy
+    end
+
+    it 'does not fail if deployment caused no updates, and stack was already in a rollback state' do
+      template = { :resources => {}}
+      allow(CfDeployer::ConfigLoader).to receive(:erb_to_json).with('web', @config).and_return(template)
+      allow(@cf_driver).to receive(:stack_exists?) { true }
+      allow(@cf_driver).to receive(:stack_status) { :update_rollback_complete }
+      expected_opt = {
+        :capabilities => [],
+        :parameters => {:foo => 'bar'}
+      }
+      expect(@cf_driver).to receive(:update_stack).with(template, expected_opt).and_return(false)
+      stack = CfDeployer::Stack.new('test','web', @config)
+      stack.deploy
+    end
+
     it 'updates a stack using the override policy, when defined' do
       template = { :resources => {}}
       override_policy = { :Statement => [] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf_deployer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jame Brechtel
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -206,6 +206,7 @@ files:
 - spec/unit/deployment_strategy/deployment_strategy_spec.rb
 - spec/unit/driver/auto_scaling_group_spec.rb
 - spec/unit/driver/cloud_formation_spec.rb
+- spec/unit/driver/dry_run_spec.rb
 - spec/unit/driver/elb_spec.rb
 - spec/unit/driver/instance_spec.rb
 - spec/unit/driver/route53_spec.rb
@@ -257,6 +258,7 @@ test_files:
 - spec/unit/deployment_strategy/deployment_strategy_spec.rb
 - spec/unit/driver/auto_scaling_group_spec.rb
 - spec/unit/driver/cloud_formation_spec.rb
+- spec/unit/driver/dry_run_spec.rb
 - spec/unit/driver/elb_spec.rb
 - spec/unit/driver/instance_spec.rb
 - spec/unit/driver/route53_spec.rb