Adding ignore_failure and epic_fail, to allow selective ignorance of provider failures.

Author: adamhjk

chef/lib/chef/resource.rb

@@ -45,6 +45,7 @@ def initialize(name, collection=nil, node=nil)
       @action = :nothing
       @updated = false
       @supports = {}
+      @ignore_failure = false
       sline = caller(4).shift
       if sline
         @source_line = sline.gsub!(/^(.+):(.+):.+$/, '\1 line \2')
@@ -102,6 +103,18 @@ def noop(tf=nil)
       end
     end
 
+    def ignore_failure(arg=nil)
+      set_or_return(
+        :ignore_failure,
+        arg,
+        :kind_of => [ TrueClass, FalseClass ]
+      )
+    end
+    
+    def epic_fail(arg=nil)
+      ignore_failure(arg)
+    end
+    
     def notifies(action, resources, timing=:delayed)
       timing = check_timing(timing)
       rarray = resources.kind_of?(Array) ? resources : [ resources ]

chef/lib/chef/runner.rb

@@ -85,7 +85,7 @@ def converge
           end
         rescue => e
           Chef::Log.error("#{resource} (#{resource.source_line}) had an error:")
-          raise 
+          raise e unless resource.ignore_failure
         end
       end
 

chef/spec/unit/resource_spec.rb

@@ -150,4 +150,19 @@
   it "should return the current value of supports" do
     @resource.supports.should == {}
   end
+  
+  it "should default to throwing an error if a provider fails for a resource" do
+    @resource.ignore_failure.should == false
+  end
+  
+  it "should allow you to set whether a provider should throw exceptions with ignore_failure" do
+    @resource.ignore_failure(true)
+    @resource.ignore_failure.should == true
+  end
+  
+  it "should allow you to epic_fail" do
+    @resource.epic_fail(true)
+    @resource.epic_fail.should == true
+  end
+  
 end

chef/spec/unit/runner_spec.rb

@@ -65,6 +65,23 @@
     @runner.converge
   end
 
+  it "should raise exceptions as thrown by a provider" do
+    Chef::Platform.stub!(:find_provider_for_node).once.and_return(Chef::Provider::SnakeOil)
+    provider = Chef::Provider::SnakeOil.new(@node, @collection[0])
+    Chef::Provider::SnakeOil.stub!(:new).once.and_return(provider)
+    provider.stub!(:action_sell).once.and_raise(ArgumentError)
+    lambda { @runner.converge }.should raise_error(ArgumentError)
+  end
+  
+  it "should not raise exceptions thrown by providers if the resource has ignore_failure set to true" do
+    Chef::Platform.stub!(:find_provider_for_node).once.and_return(Chef::Provider::SnakeOil)
+    @collection[0].stub!(:ignore_failure).and_return(true)
+    provider = Chef::Provider::SnakeOil.new(@node, @collection[0])
+    Chef::Provider::SnakeOil.stub!(:new).once.and_return(provider)
+    provider.stub!(:action_sell).once.and_raise(ArgumentError)
+    lambda { @runner.converge }.should_not raise_error(ArgumentError)
+  end
+  
   it "should execute immediate actions on changed resources" do
     Chef::Platform.should_receive(:find_provider_for_node).exactly(3).times.and_return(Chef::Provider::SnakeOil)
     provider = Chef::Provider::SnakeOil.new(@node, @collection[0])

example-repository/Rakefile

@@ -55,6 +55,7 @@ desc "Test your cookbooks for syntax errors"
 task :test do
   puts "** Testing your cookbooks for syntax errors"
   Dir[ File.join(TOPDIR, "cookbooks", "**", "*.rb") ].each do |recipe|
+    print "Testing recipe #{recipe}: "
     sh %{ruby -c #{recipe}} do |ok, res|
       if ! ok
         raise "Syntax error in #{recipe}"

example-repository/config/client.rb

@@ -1,10 +1,7 @@
 #
-# Cookbook Name:: chef
-# Attribute File:: client.rb
+# Chef Client Config File
 #
-# Copyright 2008, Engine Yard, Inc.
-#
-# All rights reserved - Do Not Redistribute
+# Will be overwritten
 #
 
 log_level        :info
@@ -19,3 +16,4 @@
 search_url       "http://127.0.0.1:4000"
 
 
+

example-repository/cookbooks/fakefile/recipes/default.rb

@@ -1,22 +1,5 @@
 bork
 
-list_of_users = []
-list_of_users << { :user => "aj", :uid => 2000, :gid => 110, :home => "/tmp/home/aj", :comment => "AJ Christensen", :shell => "/bin/bash" }.to_mash
-list_of_users << { :user => "adam", :uid => 2001, :gid => 110, :home => "/tmp/home/adam", :comment => "Adam Jacobs", :shell => "/bin/zsh" }.to_mash
-
-list_of_users.each do |u|
-  u.each { |k,v| Chef::Log.info("#{k}: #{v}") }
-  user "#{u['user']}-test" do
-    uid u['uid']
-    gid u['gid']
-    home u['home']
-    shell u['shell']
-    comment u['comment']
-    shell u['shell']
-    action [ :create, :lock ]
-  end
-end
-
 execute "write-foolio" do
   command <<-EOH
     echo 'monkeypants #{node[:ipaddress]} #{node[:friends]}' > /tmp/foolio
@@ -157,26 +140,4 @@
 
 monkey "snack"
 
-user "katie" do
-  uid 9999
-  gid 100
-  home "/tmp/home/katie"
-  shell "/bin/bash"
-  comment "Katie Bethell"
-  action :create
-end
- 
-user "katie" do
-  gid 101
-  action :modify
-end
-
-user "katie" do
-  shell "/home/katie"
-  action :manage
-end
-
-user "katie" do
-  action [ :lock, :unlock, :remove ]
-end