Enable guard_interpreters for the execute resource and set the default interpreter for the execute resource to be :execute.

This ensures that attributes of the resource like :environment & :cwd can be inherited by the guard when guard is specified as a string.

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index 80ee16c5ec..e0a1bbb8c0 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -40,6 +40,7 @@ class Chef
         @user = nil
         @allowed_actions.push(:run)
         @umask = nil
+        @guard_interpreter = :execute
       end
 
       def umask(arg=nil)
@@ -116,6 +117,30 @@ class Chef
         )
       end
 
+      def self.set_guard_inherited_attributes(*inherited_attributes)
+        @class_inherited_attributes = inherited_attributes
+      end
+
+      def self.guard_inherited_attributes(*inherited_attributes)
+        # Similar to patterns elsewhere, return attributes from this
+        # class and superclasses as a form of inheritance
+        ancestor_attributes = []
+
+        if superclass.respond_to?(:guard_inherited_attributes)
+          ancestor_attributes = superclass.guard_inherited_attributes
+        end
+
+        ancestor_attributes.concat(@class_inherited_attributes ? @class_inherited_attributes : []).uniq
+      end
+
+      set_guard_inherited_attributes(
+       :cwd,
+       :environment,
+       :group,
+       :user,
+       :umask
+       )
+
     end
   end
 end