chef 10.12.0 → 10.14.0.beta.1

data/lib/chef/provider/group/pw.rb

@@ -23,7 +23,16 @@ class Chef
         
         def load_current_resource
           super
-          raise Chef::Exceptions::Group, "Could not find binary /usr/sbin/pw for #{@new_resource}" unless ::File.exists?("/usr/sbin/pw")
+        end
+        
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a| 
+            a.assertion { ::File.exists?("/usr/sbin/pw") } 
+            a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/pw for #{@new_resource}"
+            # No whyrun alternative: this component should be available in the base install of any given system that uses it
+          end
         end
         
         # Create the group

data/lib/chef/provider/group/suse.rb

@@ -28,8 +28,15 @@ class Chef
 
         def load_current_resource
           super
+        end
 
-          raise Chef::Exceptions::Group, "Could not find binary /usr/sbin/groupmod for #{@new_resource}" unless ::File.exists?("/usr/sbin/groupmod")
+        def define_resource_requirements
+          super
+          requirements.assert(:all_actions) do |a| 
+            a.assertion { ::File.exists?("/usr/sbin/groupmod") } 
+            a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/groupmod for #{@new_resource.name}"
+            # No whyrun alternative: this component should be available in the base install of any given system that uses it
+          end
         end
 
         def modify_group_members

data/lib/chef/provider/group/usermod.rb

@@ -25,10 +25,18 @@ class Chef
         
         def load_current_resource
           super
-
-          raise Chef::Exceptions::Group, "Could not find binary /usr/sbin/usermod for #{@new_resource}" unless ::File.exists?("/usr/sbin/usermod")
         end
 
+        def define_resource_requirements
+          super
+
+          requirements.assert(:all_actions) do |a| 
+            a.assertion { ::File.exists?("/usr/sbin/usermod") } 
+            a.failure_message Chef::Exceptions::Group, "Could not find binary /usr/sbin/usermod for #{@new_resource}"
+            # No whyrun alternative: this component should be available in the base install of any given system that uses it
+          end
+        end
+        
         def modify_group_members
           case node[:platform]
           when "openbsd", "netbsd", "aix"

data/lib/chef/provider/http_request.rb

@@ -21,90 +21,101 @@ require 'tempfile'
 class Chef
   class Provider
     class HttpRequest < Chef::Provider
-      
+
       attr_accessor :rest
-      
+
+      def whyrun_supported?
+        true
+      end
+
       def load_current_resource
         @rest = Chef::REST.new(@new_resource.url, nil, nil)
       end
 
       # Send a HEAD request to @new_resource.url, with ?message=@new_resource.message
       def action_head
-        message = check_message(@new_resource.message)
-        modified = @rest.run_request(
-          :HEAD,
-          @rest.create_url("#{@new_resource.url}?message=#{message}"),
-          @new_resource.headers,
-          false,
-          10,
-          false
-        )
-        @new_resource.updated_by_last_action(modified)
-        Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful")
-        Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}")
+        converge_by("#{@new_resource} HEAD to #{@new_resource.url}") do
+          message = check_message(@new_resource.message)
+          modified = @rest.run_request(
+            :HEAD,
+            @rest.create_url("#{@new_resource.url}?message=#{message}"),
+            @new_resource.headers,
+            false,
+            10,
+            false
+          )
+          Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful")
+          Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}")
+        end
       end
 
       # Send a GET request to @new_resource.url, with ?message=@new_resource.message
       def action_get  
-        message = check_message(@new_resource.message)
-        body = @rest.run_request(
-          :GET, 
-          @rest.create_url("#{@new_resource.url}?message=#{message}"),
-          @new_resource.headers,
-          false,
-          10,
-          false
-        )
-        @new_resource.updated_by_last_action(true)
-        Chef::Log.info("#{@new_resource} GET to #{@new_resource.url} successful")
-        Chef::Log.debug("#{@new_resource} GET request response: #{body}")
+        converge_by("#{@new_resource} GET to #{@new_resource.url}") do
+
+          message = check_message(@new_resource.message)
+          body = @rest.run_request(
+            :GET, 
+            @rest.create_url("#{@new_resource.url}?message=#{message}"),
+            @new_resource.headers,
+            false,
+            10,
+            false
+          )
+          Chef::Log.info("#{@new_resource} GET to #{@new_resource.url} successful")
+          Chef::Log.debug("#{@new_resource} GET request response: #{body}")
+        end
       end
       
       # Send a PUT request to @new_resource.url, with the message as the payload
       def action_put 
-        message = check_message(@new_resource.message)
-        body = @rest.run_request(
-          :PUT,
-          @rest.create_url("#{@new_resource.url}"),
-          @new_resource.headers,
-          message,
-          10,
-          false
-        )
-        @new_resource.updated_by_last_action(true)
-        Chef::Log.info("#{@new_resource} PUT to #{@new_resource.url} successful")
-        Chef::Log.debug("#{@new_resource} PUT request response: #{body}")
+        converge_by("#{@new_resource} PUT to #{@new_resource.url}") do
+          message = check_message(@new_resource.message)
+          body = @rest.run_request(
+            :PUT,
+            @rest.create_url("#{@new_resource.url}"),
+            @new_resource.headers,
+            message,
+            10,
+            false
+          )
+          Chef::Log.info("#{@new_resource} PUT to #{@new_resource.url} successful")
+          Chef::Log.debug("#{@new_resource} PUT request response: #{body}")
+        end
       end
       
       # Send a POST request to @new_resource.url, with the message as the payload
       def action_post
-        message = check_message(@new_resource.message)
-        body = @rest.run_request(
-          :POST,
-          @rest.create_url("#{@new_resource.url}"),
-          @new_resource.headers,
-          message,
-          10,
-          false
-        )
-        @new_resource.updated_by_last_action(true)
-        Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{message.inspect} successful")
-        Chef::Log.debug("#{@new_resource} POST request response: #{body}")
+        converge_by("#{@new_resource} POST to #{@new_resource.url}") do
+          message = check_message(@new_resource.message)
+          body = @rest.run_request(
+            :POST,
+            @rest.create_url("#{@new_resource.url}"),
+            @new_resource.headers,
+            message,
+            10,
+            false
+          )
+          Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{message.inspect} successful")
+          Chef::Log.debug("#{@new_resource} POST request response: #{body}")
+        end
       end
       
       # Send a DELETE request to @new_resource.url
       def action_delete
-        body = @rest.run_request(
-          :DELETE,
-          @rest.create_url("#{@new_resource.url}"),
-          @new_resource.headers,
-          false,
-          10,
-          false
-        )
-        @new_resource.updated_by_last_action(true)
-        Chef::Log.info("#{@new_resource} DELETE to #{@new_resource.url} successful")
-        Chef::Log.debug("#{@new_resource} DELETE request response: #{body}")
+        converge_by("#{@new_resource} DELETE to #{@new_resource.url}") do
+          body = @rest.run_request(
+            :DELETE,
+            @rest.create_url("#{@new_resource.url}"),
+            @new_resource.headers,
+            false,
+            10,
+            false
+          )
+          @new_resource.updated_by_last_action(true)
+          Chef::Log.info("#{@new_resource} DELETE to #{@new_resource.url} successful")
+          Chef::Log.debug("#{@new_resource} DELETE request response: #{body}")
+        end
       end
       
       private

data/lib/chef/provider/ifconfig.rb

@@ -19,6 +19,7 @@
 require 'chef/log'
 require 'chef/mixin/command'
 require 'chef/provider'
+require 'chef/exceptions'
 require 'erb'
 
 #  Recipe example:
@@ -38,12 +39,17 @@ class Chef
     class Ifconfig < Chef::Provider
       include Chef::Mixin::Command
 
+      def whyrun_supported?
+        true
+      end
+
       def load_current_resource
         @current_resource = Chef::Resource::Ifconfig.new(@new_resource.name)
 
+        @ifconfig_success = true
         @interfaces = {}
 
-        status = popen4("ifconfig") do |pid, stdin, stdout, stderr|
+        @status = popen4("ifconfig") do |pid, stdin, stdout, stderr|
           stdout.each do |line|
 
             if !line[0..9].strip.empty?
@@ -71,16 +77,21 @@ class Chef
             end
           end
         end
+        @current_resource
+      end
 
-        unless status.exitstatus == 0
-          raise Chef::Exception::Ifconfig, "ifconfig failed - #{status.inspect}!"
+      def define_resource_requirements 
+        requirements.assert(:all_actions) do |a| 
+          a.assertion { @status.exitstatus == 0 }
+          a.failure_message Chef::Exceptions::Ifconfig, "ifconfig failed - #{@status.inspect}!"
+          # no whyrun - if the base ifconfig used in load_current_resource fails
+          # there's no reasonable action that could have been taken in the course of 
+          # a chef run to fix it.
         end
-
-        @current_resource
       end
 
       def action_add
-        # check to see if load_current_resource found ifconfig
+        # check to see if load_current_resource found interface in ifconfig
         unless @current_resource.inet_addr
           unless @new_resource.device == "lo"
             command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
@@ -88,12 +99,12 @@ class Chef
             command << " metric #{@new_resource.metric}" if @new_resource.metric
             command << " mtu #{@new_resource.mtu}" if @new_resource.mtu
           end
-
-          run_command(
-            :command => command
-          )
-          Chef::Log.info("#{@new_resource} added")
-          @new_resource.updated_by_last_action(true)
+          converge_by ("run #{command} to add #{@new_resource}") do
+            run_command(
+              :command => command
+            )
+            Chef::Log.info("#{@new_resource} added")
+          end
         end
 
         # Write out the config files
@@ -111,11 +122,12 @@ class Chef
             command << " mtu #{@new_resource.mtu}" if @new_resource.mtu
           end
 
-          run_command(
-            :command => command
-          )
-          Chef::Log.info("#{@new_resource} enabled")
-          @new_resource.updated_by_last_action(true)
+          converge_by ("run #{command} to enable #{@new_resource}") do
+            run_command(
+              :command => command
+            )
+            Chef::Log.info("#{@new_resource} enabled")
+          end
         end
       end
 
@@ -123,12 +135,13 @@ class Chef
         # check to see if load_current_resource found the interface
         if @current_resource.device
           command = "ifconfig #{@new_resource.device} down"
-          run_command(
-            :command => command
-          )
-          delete_config
-          Chef::Log.info("#{@new_resource} deleted")
-          @new_resource.updated_by_last_action(true)
+          converge_by ("run #{command} to delete #{@new_resource}") do
+            run_command(
+              :command => command
+            )
+            delete_config
+            Chef::Log.info("#{@new_resource} deleted")
+          end
         else
           Chef::Log.debug("#{@new_resource} does not exist - nothing to do")
         end
@@ -139,11 +152,12 @@ class Chef
         # disables, but leaves config files in place.
         if @current_resource.device
           command = "ifconfig #{@new_resource.device} down"
-          run_command(
-            :command => command
-          )
-          Chef::Log.info("#{@new_resource} disabled")
-          @new_resource.updated_by_last_action(true)
+          converge_by ("run #{command} to disable #{@new_resource}") do
+            run_command(
+              :command => command
+            )
+            Chef::Log.info("#{@new_resource} disabled")
+          end
         else
           Chef::Log.debug("#{@new_resource} does not exist - nothing to do")
         end
@@ -164,9 +178,12 @@ class Chef
 <% if @new_resource.onparent %>ONPARENT=<%= @new_resource.onparent %><% end %>
           }
           template = ::ERB.new(content)
-          network_file = ::File.new("/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}", "w")
-          network_file.puts(template.result(b))
-          network_file.close
+          network_file_name = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
+          converge_by ("generate configuration file : #{network_file_name}") do
+            network_file = ::File.new(network_file_name, "w")
+            network_file.puts(template.result(b))
+            network_file.close
+          end
           Chef::Log.info("#{@new_resource} created configuration file")
         when "debian","ubuntu"
           # template
@@ -181,7 +198,9 @@ class Chef
         when "centos","redhat","fedora"
           ifcfg_file = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"
           if ::File.exist?(ifcfg_file)
-            FileUtils.rm_f(ifcfg_file, :verbose => false, :force => true)
+            converge_by ("delete the #{ifcfg_file}") do
+              FileUtils.rm_f(ifcfg_file, :verbose => false, :force => true)
+            end
           end
         when "debian","ubuntu"
           # delete configs

data/lib/chef/provider/link.rb

@@ -21,6 +21,7 @@ require 'chef/log'
 require 'chef/mixin/shell_out'
 require 'chef/resource/link'
 require 'chef/provider'
+require 'chef/scan_access_control'
 
 class Chef
   class Provider
@@ -54,6 +55,10 @@ class Chef
 
       private :negative_complement
 
+      def whyrun_supported?
+        true
+      end
+
       def load_current_resource
         @current_resource = Chef::Resource::Link.new(@new_resource.name)
         @current_resource.target_file(@new_resource.target_file)
@@ -62,9 +67,6 @@ class Chef
           @current_resource.to(
             canonicalize(file_class.readlink(@current_resource.target_file))
           )
-          cstats = ::File.lstat(@current_resource.target_file)
-          @current_resource.owner(cstats.uid)
-          @current_resource.group(cstats.gid)
         else
           @current_resource.link_type(:hard)
           if ::File.exists?(@current_resource.target_file)
@@ -77,9 +79,25 @@ class Chef
             end
           end
         end
+        ScanAccessControl.new(@new_resource, @current_resource).set_all!
         @current_resource
       end
 
+      def define_resource_requirements
+        requirements.assert(:delete) do |a|
+          a.assertion do
+            if @current_resource.to
+              @current_resource.link_type == @new_resource.link_type and
+              (@current_resource.link_type == :symbolic  or @current_resource.to != '')
+            else
+              true
+            end
+          end
+          a.failure_message Chef::Exceptions::Link, "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a #{@new_resource.link_type.to_s} link."
+          a.whyrun("Would assume the link at #{@new_resource.target_file} was previously created")
+        end
+      end
+
       def canonicalize(path)
         Chef::Platform.windows? ? path.gsub('/', '\\') : path
       end
@@ -87,51 +105,42 @@ class Chef
       def action_create
         if @current_resource.to != canonicalize(@new_resource.to) ||
            @current_resource.link_type != @new_resource.link_type
-          if @new_resource.link_type == :symbolic
-            if @current_resource.to # nil if target_file does not exist
+          if @current_resource.to # nil if target_file does not exist
+            converge_by("unlink existing file at #{@new_resource.target_file}") do
               ::File.unlink(@new_resource.target_file)
             end
-            file_class.symlink(canonicalize(@new_resource.to),@new_resource.target_file)
-            Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
-            Chef::Log.info("#{@new_resource} created")
+          end
+          if @new_resource.link_type == :symbolic
+            converge_by("create symlink at #{@new_resource.target_file} to #{@new_resource.to}") do
+              file_class.symlink(canonicalize(@new_resource.to),@new_resource.target_file)
+              Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
+              Chef::Log.info("#{@new_resource} created")
+            end
           elsif @new_resource.link_type == :hard
-            if @current_resource.to # nil if target_file does not exist
-              ::File.unlink(@new_resource.target_file)
+            converge_by("create hard link at #{@new_resource.target_file} to #{@new_resource.to}") do
+              file_class.link(@new_resource.to, @new_resource.target_file)
+              Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
+              Chef::Log.info("#{@new_resource} created")
             end
-            file_class.link(@new_resource.to, @new_resource.target_file)
-            Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
-            Chef::Log.info("#{@new_resource} created")
           end
-          @new_resource.updated_by_last_action(true)
         end
         if @new_resource.link_type == :symbolic
-          enforce_ownership_and_permissions @new_resource.target_file
-        end
+          if access_controls.requires_changes?
+            converge_by(access_controls.describe_changes) do 
+              access_controls.set_all
+            end
+          end
+       end
       end
 
       def action_delete
         if @current_resource.to # Exists
-          if @current_resource.link_type == @new_resource.link_type
-            unless @current_resource.link_type == :hard && @current_resource.to == ''
-              ::File.delete(@new_resource.target_file)
-              Chef::Log.info("#{@new_resource} deleted")
-              @new_resource.updated_by_last_action(true)
-              return
-            end
+          converge_by ("delete link at #{@new_resource.target_file}") do
+            ::File.delete(@new_resource.target_file)
+            Chef::Log.info("#{@new_resource} deleted")
           end
-          raise Chef::Exceptions::Link, "Cannot delete #{@new_resource} at #{@new_resource.target_file}! Not a #{@new_resource.link_type.to_s} link."
         end
       end
     end
-
-    # private
-    # def hardlink?(target, to)
-    #   s = file_class()
-    #   if file_class.respond_to?(:hardlink?)
-    #     file_class.hardlink?(target)
-    #   else
-    #     ::File.stat(target).ino == ::File.stat(to).ino
-    #   end
-    # end
   end
 end