Merge pull request #5446 from chef/lcg/tweak-delayed-action-api

Core: make delayed_action argument mandatory, remove misleading ivar introduced in PR that added delayed_action

1 files changed, 9 insertions, 15 deletions

diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index 8048330ce1..074ab772a1 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -186,22 +186,16 @@ class Chef
     # This should most likely be paired with action :nothing
     #
     # @param arg [Array[Symbol], Symbol] A list of actions (e.g. `:create`)
-    # @return [Array[Symbol]] the list of actions.
     #
-    def delayed_action(arg = nil)
-      if arg
-        arg = Array(arg).map(&:to_sym)
-        arg.each do |action|
-          validate(
-            { action: action },
-            { action: { kind_of: Symbol, equal_to: allowed_actions } }
-          )
-          # the resource effectively sends a delayed notification to itself
-          run_context.add_delayed_action(Notification.new(self, action, self))
-        end
-        @delayed_action = arg
-      else
-        @delayed_action
+    def delayed_action(arg)
+      arg = Array(arg).map(&:to_sym)
+      arg.map do |action|
+        validate(
+          { action: action },
+          { action: { kind_of: Symbol, equal_to: allowed_actions } }
+        )
+        # the resource effectively sends a delayed notification to itself
+        run_context.add_delayed_action(Notification.new(self, action, self))
       end
     end