Merge pull request #4236 from chef/jdm/dsc_resource_timeout

Add timeout attribute to dsc_resource

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb
index efbe4eccef..fd25a14ea5 100644
--- a/lib/chef/provider/dsc_resource.rb
+++ b/lib/chef/provider/dsc_resource.rb
@@ -154,7 +154,7 @@ class Chef
           "Invoke-DscResource #{switches}",
           output_format
         )
-        cmdlet.run!
+        cmdlet.run!({}, {:timeout => new_resource.timeout})
       end
 
       def return_dsc_resource_result(result, property_name)
diff --git a/lib/chef/resource/dsc_resource.rb b/lib/chef/resource/dsc_resource.rb
index 1dcde8de96..0664dc7d7f 100644
--- a/lib/chef/resource/dsc_resource.rb
+++ b/lib/chef/resource/dsc_resource.rb
@@ -89,7 +89,7 @@ class Chef
 

       # This property takes the action message for the reboot resource

       # If the set method of the DSC resource indicate that a reboot

-      # is necessary, reboot_action provides the mechanism for a reboot to 

+      # is necessary, reboot_action provides the mechanism for a reboot to

       # be requested.

       def reboot_action(value=nil)

         if value

@@ -98,6 +98,14 @@ class Chef
           @reboot_action

         end

       end

+

+      def timeout(arg=nil)

+        set_or_return(

+          :timeout,

+          arg,

+          :kind_of => [ Integer ]

+        )

+      end

       private

 

       def value_of(value)