Remove logic for finding run_id in favor of relying on run_status.

Signed-off-by: Pete Higgins <pete@peterhiggins.org>

1 files changed, 1 insertions, 15 deletions

diff --git a/lib/chef/audit/runner.rb b/lib/chef/audit/runner.rb
index 46236f17bb..e0e9ccc314 100644
--- a/lib/chef/audit/runner.rb
+++ b/lib/chef/audit/runner.rb
@@ -14,7 +14,7 @@ class Chef
       extend Forwardable
 
       attr_reader :run_status
-      def_delegators :run_status, :node, :run_context
+      def_delegators :run_status, :node, :run_context, :run_id
       def_delegators :node, :logger
 
       def enabled?
@@ -206,20 +206,6 @@ class Chef
           Chef::Log.warn "#{reporter} is not a supported InSpec report collector"
         end
       end
-
-      # TODO: This is probably much more careful than it needs to be
-      def run_id
-        return unless run_context &&
-          run_context.events &&
-          run_context.events.subscribers.is_a?(Array)
-
-        run_context.events.subscribers.each do |sub|
-          if sub.class == Chef::ResourceReporter && defined?(sub.run_id)
-            return sub.run_id
-          end
-        end
-        nil
-      end
     end
   end
 end