clean up the chefutils wiring with a common helper classlcg/extract-mixlib-shellout

also fixes a FIXME in the YARD

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 2 insertions, 15 deletions

diff --git a/lib/chef/mixin/shell_out.rb b/lib/chef/mixin/shell_out.rb
index e136fe09ba..c3eacc57f0 100644
--- a/lib/chef/mixin/shell_out.rb
+++ b/lib/chef/mixin/shell_out.rb
@@ -16,26 +16,13 @@
 # limitations under the License.
 
 require "mixlib/shellout/helper" unless defined?(Mixlib::ShellOut::Helper)
-require_relative "../log"
-require_relative "../config"
-require_relative "../chef_class"
+require "chef/mixin/chef_utils_wiring" unless defined?(Chef::Mixin::ChefUtilsWiring)
 
 class Chef
   module Mixin
     module ShellOut
       include Mixlib::ShellOut::Helper
-
-      def __config
-        Chef::Config
-      end
-
-      def __log
-        Chef::Log
-      end
-
-      def __transport_connection
-        Chef.run_context&.transport_connection
-      end
+      include Chef::Mixin::ChefUtilsWiring
     end
   end
 end