chef 16.4.38-universal-mingw32 → 16.7.61-universal-mingw32

data/lib/chef/application/client.rb

@@ -20,7 +20,14 @@
 require_relative "base"
 require_relative "../handler/error_report"
 require_relative "../workstation_config_loader"
-require "uri" unless defined?(URI)
+autoload :URI, "uri"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
+module Mixlib
+  module Authentication
+    autoload :Log, "mixlib/authentication"
+  end
+end
+autoload :Train, "train"
 
 # DO NOT MAKE EDITS, see Chef::Application::Base
 #
@@ -45,7 +52,7 @@ class Chef::Application::Client < Chef::Application::Base
   option :pid_file,
     short: "-P PID_FILE",
     long: "--pid PIDFILE",
-    description: "Set the PID file location, for the #{Chef::Dist::CLIENT} daemon process. Defaults to /tmp/chef-client.pid.",
+    description: "Set the PID file location, for the #{ChefUtils::Dist::Infra::CLIENT} daemon process. Defaults to /tmp/chef-client.pid.",
     proc: nil
 
   option :runlist,
@@ -100,7 +107,7 @@ class Chef::Application::Client < Chef::Application::Base
         tarball_path = File.join(Chef::Config.chef_repo_path, "recipes.tgz")
         fetch_recipe_tarball(Chef::Config[:recipe_url], tarball_path)
         Mixlib::Archive.new(tarball_path).extract(Chef::Config.chef_repo_path, perms: false, ignore: /^\.$/)
-        config_path = File.join(Chef::Config.chef_repo_path, "#{Chef::Dist::USER_CONF_DIR}/config.rb")
+        config_path = File.join(Chef::Config.chef_repo_path, "#{ChefUtils::Dist::Infra::USER_CONF_DIR}/config.rb")
         Chef::Config.from_string(IO.read(config_path), config_path) if File.file?(config_path)
       end
     end
@@ -109,8 +116,12 @@ class Chef::Application::Client < Chef::Application::Base
     Chef::Config.chef_zero.port = config[:chef_zero_port] if config[:chef_zero_port]
 
     if config[:target] || Chef::Config.target
-      Chef::Config.target_mode.enabled = true
       Chef::Config.target_mode.host = config[:target] || Chef::Config.target
+      if URI.parse(Chef::Config.target_mode.host).scheme
+        train_config = Train.unpack_target_from_uri(Chef::Config.target_mode.host)
+        Chef::Config.target_mode = train_config
+      end
+      Chef::Config.target_mode.enabled = true
       Chef::Config.node_name = Chef::Config.target_mode.host unless Chef::Config.node_name
     end
 
@@ -147,7 +158,7 @@ class Chef::Application::Client < Chef::Application::Base
       if config[:local_mode]
         config[:config_file] = Chef::WorkstationConfigLoader.new(nil, Chef::Log).config_location
       else
-        config[:config_file] = Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/client.rb")
+        config[:config_file] = Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/client.rb")
       end
     end
 

data/lib/chef/application/exit_code.rb

@@ -22,7 +22,7 @@ class Chef
     # These are the exit codes defined in Chef RFC 062
     # https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md
     class ExitCode
-      require_relative "../dist"
+      require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
       # -1 is defined as DEPRECATED_FAILURE in RFC 062, so it is
       # not enumerated in an active constant.
@@ -36,6 +36,7 @@ class Chef
         REBOOT_NEEDED: 37,
         REBOOT_FAILED: 41,
         # 42 was used by audit mode and should not be reused
+        CONFIG_FAILURE: 43,
         CLIENT_UPGRADED: 213,
       }.freeze
 
@@ -79,6 +80,8 @@ class Chef
             VALID_RFC_062_EXIT_CODES[:REBOOT_NEEDED]
           elsif reboot_failed?(exception)
             VALID_RFC_062_EXIT_CODES[:REBOOT_FAILED]
+          elsif configuration_failure?(exception)
+            VALID_RFC_062_EXIT_CODES[:CONFIG_FAILURE]
           elsif client_upgraded?(exception)
             VALID_RFC_062_EXIT_CODES[:CLIENT_UPGRADED]
           else
@@ -104,6 +107,12 @@ class Chef
           end
         end
 
+        def configuration_failure?(exception)
+          resolve_exception_array(exception).any? do |e|
+            e.is_a? Chef::Exceptions::ConfigurationError
+          end
+        end
+
         def client_upgraded?(exception)
           resolve_exception_array(exception).any? do |e|
             e.is_a? Chef::Exceptions::ClientUpgraded
@@ -144,9 +153,9 @@ class Chef
         end
 
         def non_standard_exit_code_warning(exit_code)
-          "#{Chef::Dist::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
-          " The #{Chef::Dist::PRODUCT} Exit Codes design document (https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md)" \
-          " defines the exit codes that should be used with #{Chef::Dist::CLIENT}. Chef::Application::ExitCode defines"  \
+          "#{ChefUtils::Dist::Infra::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
+          " The #{ChefUtils::Dist::Infra::PRODUCT} Exit Codes design document (https://github.com/chef/chef-rfc/blob/master/rfc062-exit-status.md)" \
+          " defines the exit codes that should be used with #{ChefUtils::Dist::Infra::CLIENT}. Chef::Application::ExitCode defines"  \
           " valid exit codes Non-standard exit codes are redefined as GENERIC_FAILURE."
         end
 

data/lib/chef/application/knife.rb

@@ -19,8 +19,10 @@ require_relative "../knife"
 require_relative "../application"
 require "mixlib/log"
 require "ohai/config"
-require "chef/monkey_patches/net_http.rb"
-require_relative "../dist"
+module Net
+  autoload :HTTP, "net/http"
+end
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef::Application::Knife < Chef::Application
 
@@ -59,7 +61,7 @@ class Chef::Application::Knife < Chef::Application
   option :environment,
     short: "-E ENVIRONMENT",
     long: "--environment ENVIRONMENT",
-    description: "Set the #{Chef::Dist::PRODUCT} environment (except for in searches, where this will be flagrantly ignored)."
+    description: "Set the #{ChefUtils::Dist::Infra::PRODUCT} environment (except for in searches, where this will be flagrantly ignored)."
 
   option :editor,
     short: "-e EDITOR",
@@ -84,18 +86,18 @@ class Chef::Application::Knife < Chef::Application
   option :node_name,
     short: "-u USER",
     long: "--user USER",
-    description: "#{Chef::Dist::SERVER_PRODUCT} API client username."
+    description: "#{ChefUtils::Dist::Server::PRODUCT} API client username."
 
   option :client_key,
     short: "-k KEY",
     long: "--key KEY",
-    description: "#{Chef::Dist::SERVER_PRODUCT} API client key.",
+    description: "#{ChefUtils::Dist::Server::PRODUCT} API client key.",
     proc: lambda { |path| File.expand_path(path, Dir.pwd) }
 
   option :chef_server_url,
     short: "-s URL",
     long: "--server-url URL",
-    description: "#{Chef::Dist::SERVER_PRODUCT} URL."
+    description: "#{ChefUtils::Dist::Server::PRODUCT} URL."
 
   option :yes,
     short: "-y",
@@ -120,16 +122,16 @@ class Chef::Application::Knife < Chef::Application
   option :local_mode,
     short: "-z",
     long: "--local-mode",
-    description: "Point knife commands at local repository instead of #{Chef::Dist::SERVER_PRODUCT}.",
+    description: "Point knife commands at local repository instead of #{ChefUtils::Dist::Server::PRODUCT}.",
     boolean: true
 
   option :chef_zero_host,
     long: "--chef-zero-host HOST",
-    description: "Host to start #{Chef::Dist::ZERO} on."
+    description: "Host to start #{ChefUtils::Dist::Zero::PRODUCT} on."
 
   option :chef_zero_port,
     long: "--chef-zero-port PORT",
-    description: "Port (or port range) to start #{Chef::Dist::ZERO} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
+    description: "Port (or port range) to start #{ChefUtils::Dist::Zero::PRODUCT} on. Port ranges like 1000,1010 or 8889-9999 will try all given ports until one works."
 
   option :listen,
     long: "--[no-]listen",
@@ -139,9 +141,9 @@ class Chef::Application::Knife < Chef::Application
   option :version,
     short: "-v",
     long: "--version",
-    description: "Show #{Chef::Dist::PRODUCT} version.",
+    description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
     boolean: true,
-    proc: lambda { |v| puts "#{Chef::Dist::PRODUCT}: #{::Chef::VERSION}" },
+    proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
     exit: 0
 
   option :fips,
@@ -214,6 +216,15 @@ class Chef::Application::Knife < Chef::Application
     rescue OptionParser::InvalidOption => e
       puts "#{e}\n"
     end
+
+    if want_help?
+      puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{Chef::VERSION}"
+      puts
+      puts "Docs: #{ChefUtils::Dist::Org::KNIFE_DOCS}"
+      puts "Patents: #{ChefUtils::Dist::Org::PATENTS}"
+      puts
+    end
+
     puts opt_parser
     puts
     Chef::Knife.list_commands

data/lib/chef/application/solo.rb

@@ -21,6 +21,7 @@ require_relative "../../chef"
 require_relative "client"
 require "fileutils" unless defined?(FileUtils)
 require "pathname" unless defined?(Pathname)
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 # DO NOT MAKE EDITS, see Chef::Application::Base
 #
@@ -33,7 +34,7 @@ class Chef::Application::Solo < Chef::Application::Base
   option :config_file,
     short: "-c CONFIG",
     long: "--config CONFIG",
-    default: Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/solo.rb"),
+    default: Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/solo.rb"),
     description: "The configuration file to use."
 
   unless ChefUtils.windows?

data/lib/chef/application/windows_service.rb

@@ -29,7 +29,7 @@ require "socket" unless defined?(Socket)
 require "uri" unless defined?(URI)
 require "win32/daemon"
 require_relative "../mixin/shell_out"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Application
@@ -41,7 +41,7 @@ class Chef
         short: "-c CONFIG",
         long: "--config CONFIG",
         default: "#{Chef::Config.etc_chef_dir}/client.rb",
-        description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs."
+        description: "The configuration file to use for #{ChefUtils::Dist::Infra::PRODUCT} runs."
 
       option :log_location,
         short: "-L LOGLOCATION",
@@ -57,7 +57,7 @@ class Chef
       option :interval,
         short: "-i SECONDS",
         long: "--interval SECONDS",
-        description: "Set the number of seconds to wait between #{Chef::Dist::PRODUCT} runs.",
+        description: "Set the number of seconds to wait between #{ChefUtils::Dist::Infra::PRODUCT} runs.",
         proc: lambda { |s| s.to_i }
 
       DEFAULT_LOG_LOCATION ||= "#{Chef::Config.c_chef_dir}/client.log".freeze
@@ -67,7 +67,7 @@ class Chef
         @service_signal = ConditionVariable.new
 
         reconfigure
-        Chef::Log.info("#{Chef::Dist::CLIENT} Service initialized")
+        Chef::Log.info("#{ChefUtils::Dist::Infra::CLIENT} Service initialized")
       end
 
       def service_main(*startup_parameters)
@@ -79,7 +79,7 @@ class Chef
           # Grab the service_action_mutex to make a chef-client run
           @service_action_mutex.synchronize do
 
-            Chef::Log.info("Next #{Chef::Dist::CLIENT} run will happen in #{timeout} seconds")
+            Chef::Log.info("Next #{ChefUtils::Dist::Infra::CLIENT} run will happen in #{timeout} seconds")
             @service_signal.wait(@service_action_mutex, timeout)
 
             # Continue only if service is RUNNING
@@ -96,7 +96,7 @@ class Chef
             # run chef-client only if service is in RUNNING state
             next if state != RUNNING
 
-            Chef::Log.info("#{Chef::Dist::CLIENT} service is starting a #{Chef::Dist::CLIENT} run...")
+            Chef::Log.info("#{ChefUtils::Dist::Infra::CLIENT} service is starting a #{ChefUtils::Dist::Infra::CLIENT} run...")
             run_chef_client
           rescue SystemExit => e
             # Do not raise any of the errors here in order to
@@ -131,12 +131,12 @@ class Chef
             break
           else
             unless run_warning_displayed
-              Chef::Log.info("Currently a #{Chef::Dist::PRODUCT} run is happening on this system.")
+              Chef::Log.info("Currently a #{ChefUtils::Dist::Infra::PRODUCT} run is happening on this system.")
               Chef::Log.info("Service will stop when run is completed.")
               run_warning_displayed = true
             end
 
-            Chef::Log.trace("Waiting for #{Chef::Dist::PRODUCT} run...")
+            Chef::Log.trace("Waiting for #{ChefUtils::Dist::Infra::PRODUCT} run...")
             sleep 1
           end
         end
@@ -150,7 +150,7 @@ class Chef
         # since this is a PAUSE signal.
 
         if @service_action_mutex.locked?
-          Chef::Log.info("Currently a #{Chef::Dist::PRODUCT} run is happening.")
+          Chef::Log.info("Currently a #{ChefUtils::Dist::Infra::PRODUCT} run is happening.")
           Chef::Log.info("Service will pause once it's completed.")
         else
           Chef::Log.info("Service is pausing....")
@@ -185,7 +185,7 @@ class Chef
         # The log_location and config_file of the parent process is passed to the new chef-client process.
         # We need to add the --no-fork, as by default it is set to fork=true.
 
-        Chef::Log.info "Starting #{Chef::Dist::CLIENT} in a new process"
+        Chef::Log.info "Starting #{ChefUtils::Dist::Infra::CLIENT} in a new process"
         # Pass config params to the new process
         config_params = " --no-fork"
         config_params += " -c #{Chef::Config[:config_file]}" unless Chef::Config[:config_file].nil?
@@ -197,20 +197,20 @@ class Chef
         # Starts a new process and waits till the process exits
 
         result = shell_out(
-          "#{Chef::Dist::CLIENT}.bat #{config_params}",
+          "#{ChefUtils::Dist::Infra::CLIENT}.bat #{config_params}",
           timeout: Chef::Config[:windows_service][:watchdog_timeout],
           logger: Chef::Log
         )
         Chef::Log.trace (result.stdout).to_s
         Chef::Log.trace (result.stderr).to_s
       rescue Mixlib::ShellOut::CommandTimeout => e
-        Chef::Log.error "#{Chef::Dist::CLIENT} timed out\n(#{e})"
+        Chef::Log.error "#{ChefUtils::Dist::Infra::CLIENT} timed out\n(#{e})"
         Chef::Log.error(<<-EOF)
-            Your #{Chef::Dist::CLIENT} run timed out. You can increase the time #{Chef::Dist::CLIENT} is given
+            Your #{ChefUtils::Dist::Infra::CLIENT} run timed out. You can increase the time #{ChefUtils::Dist::Infra::CLIENT} is given
             to complete by configuring windows_service.watchdog_timeout in your client.rb.
         EOF
       rescue Mixlib::ShellOut::ShellCommandFailed => e
-        Chef::Log.warn "Not able to start #{Chef::Dist::CLIENT} in new process (#{e})"
+        Chef::Log.warn "Not able to start #{ChefUtils::Dist::Infra::CLIENT} in new process (#{e})"
       rescue => e
         Chef::Log.error e
       ensure

data/lib/chef/application/windows_service_manager.rb

@@ -21,7 +21,7 @@ if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
 end
 require_relative "../config"
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   class Application
@@ -41,18 +41,18 @@ class Chef
         short: "-a ACTION",
         long: "--action ACTION",
         default: "status",
-        description: "Action to carry out on #{Chef::Dist::SHORT}-service (install, uninstall, status, start, stop, pause, or resume)."
+        description: "Action to carry out on #{ChefUtils::Dist::Infra::SHORT}-service (install, uninstall, status, start, stop, pause, or resume)."
 
       option :config_file,
         short: "-c CONFIG",
         long: "--config CONFIG",
         default: "#{ChefConfig::Config.c_chef_dir}/client.rb",
-        description: "The configuration file to use for #{Chef::Dist::PRODUCT} runs."
+        description: "The configuration file to use for #{ChefUtils::Dist::Infra::PRODUCT} runs."
 
       option :log_location,
         short: "-L LOGLOCATION",
         long: "--logfile LOGLOCATION",
-        description: "Set the log file location for #{Chef::Dist::SHORT}-service."
+        description: "Set the log file location for #{ChefUtils::Dist::Infra::SHORT}-service."
 
       option :help,
         short: "-h",
@@ -66,9 +66,9 @@ class Chef
       option :version,
         short: "-v",
         long: "--version",
-        description: "Show #{Chef::Dist::PRODUCT} version.",
+        description: "Show #{ChefUtils::Dist::Infra::PRODUCT} version.",
         boolean: true,
-        proc: lambda { |v| puts "#{Chef::Dist::PRODUCT}: #{::Chef::VERSION}" },
+        proc: lambda { |v| puts "#{ChefUtils::Dist::Infra::PRODUCT}: #{::Chef::VERSION}" },
         exit: 0
 
       def initialize(service_options)

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -265,7 +265,7 @@ class Chef
           @memory_store.get(path)
 
         elsif path[0] == "file_store" && path[1] == "repo"
-          entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[2..-1].join("/"))
+          entry = Chef::ChefFS::FileSystem.resolve_path(chef_fs, path[2..].join("/"))
           begin
             entry.read
           rescue Chef::ChefFS::FileSystem::NotFoundError => e

data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb

@@ -24,7 +24,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          key == "cookbook_name" || key == "version"
+          %w{cookbook_name version}.include?(key)
         end
 
         def chef_class

data/lib/chef/chef_fs/file_pattern.rb

@@ -204,7 +204,7 @@ class Chef
             end
 
             # Skip // and /./ (pretend it's not there)
-            if exact == "" || exact == "."
+            if ["", "."].include?(exact)
               next
             end
 

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb

@@ -64,7 +64,7 @@ class Chef
             if is_dir
               return recursive && name != "." && name != ".."
             elsif ruby_only
-              return false if name[-3..-1] != ".rb"
+              return false if name[-3..] != ".rb"
             end
 
             # Check chefignore

data/lib/chef/chef_fs/knife.rb

@@ -18,7 +18,7 @@
 
 require_relative "../knife"
 require "pathname" unless defined?(Pathname)
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 class Chef
   module ChefFS
@@ -49,7 +49,7 @@ class Chef
 
       option :chef_repo_path,
         long: "--chef-repo-path PATH",
-        description: "Overrides the location of #{Chef::Dist::PRODUCT} repo. Default is specified by chef_repo_path in the config"
+        description: "Overrides the location of #{ChefUtils::Dist::Infra::PRODUCT} repo. Default is specified by chef_repo_path in the config"
 
       option :concurrency,
         long: "--concurrency THREADS",

data/lib/chef/chef_fs/parallelizer.rb

@@ -1,4 +1,3 @@
-require "thread"
 require_relative "parallelizer/parallel_enumerable"
 
 class Chef

data/lib/chef/client.rb

@@ -29,7 +29,7 @@ require_relative "api_client/registration"
 require_relative "node"
 require_relative "role"
 require_relative "file_cache"
-require_relative "run_context"
+Chef.autoload :RunContext, File.expand_path("run_context", __dir__)
 require_relative "runner"
 require_relative "run_status"
 require_relative "cookbook/cookbook_collection"
@@ -48,14 +48,13 @@ require_relative "action_collection"
 require_relative "resource_reporter"
 require_relative "data_collector"
 require_relative "run_lock"
-require_relative "policy_builder"
+Chef.autoload :PolicyBuilder, File.expand_path("policy_builder", __dir__)
 require_relative "request_id"
 require_relative "platform/rebooter"
 require_relative "mixin/deprecation"
 require "chef-utils" unless defined?(ChefUtils::CANARY)
 require "ohai" unless defined?(Ohai::System)
 require "rbconfig" unless defined?(RbConfig)
-require_relative "dist"
 require "forwardable" unless defined?(Forwardable)
 
 class Chef
@@ -244,19 +243,15 @@ class Chef
         run_status.run_context = run_context
 
         events.run_start(Chef::VERSION, run_status)
-
-        logger.info("*** #{Chef::Dist::PRODUCT} #{Chef::VERSION} ***")
+        logger.info("*** #{ChefUtils::Dist::Infra::PRODUCT} #{Chef::VERSION} ***")
         logger.info("Platform: #{RUBY_PLATFORM}")
-        logger.info "#{Chef::Dist::CLIENT.capitalize} pid: #{Process.pid}"
+        logger.info "#{ChefUtils::Dist::Infra::CLIENT.capitalize} pid: #{Process.pid}"
         logger.info "Targeting node: #{Chef::Config.target_mode.host}" if Chef::Config.target_mode?
-        logger.debug("#{Chef::Dist::CLIENT.capitalize} request_id: #{request_id}")
+        logger.debug("#{ChefUtils::Dist::Infra::CLIENT.capitalize} request_id: #{request_id}")
+        logger.warn("`enforce_path_sanity` is deprecated, please use `enforce_default_paths` instead!") if Chef::Config[:enforce_path_sanity]
         ENV["PATH"] = ChefUtils::DSL::DefaultPaths.default_paths if Chef::Config[:enforce_default_paths] || Chef::Config[:enforce_path_sanity]
 
-        if Chef::Config.target_mode?
-          get_ohai_data_remotely
-        else
-          run_ohai
-        end
+        run_ohai
 
         unless Chef::Config[:solo_legacy_mode]
           register
@@ -273,7 +268,7 @@ class Chef
         build_node
 
         run_status.start_clock
-        logger.info("Starting #{Chef::Dist::PRODUCT} Run for #{node.name}")
+        logger.info("Starting #{ChefUtils::Dist::Infra::PRODUCT} Run for #{node.name}")
         run_started
 
         do_windows_admin_check
@@ -288,7 +283,7 @@ class Chef
         converge_and_save(run_context)
 
         run_status.stop_clock
-        logger.info("#{Chef::Dist::PRODUCT} Run complete in #{run_status.elapsed_time} seconds")
+        logger.info("#{ChefUtils::Dist::Infra::PRODUCT} Run complete in #{run_status.elapsed_time} seconds")
         run_completed_successfully
         events.run_completed(node, run_status)
 
@@ -334,7 +329,7 @@ class Chef
       eol_year = 2006 + Gem::Version.new(Chef::VERSION).segments.first
 
       if Time.now > Time.new(eol_year, 5, 01)
-        logger.warn("This release of #{Chef::Dist::PRODUCT} became end of life (EOL) on May 1st #{eol_year}. Please update to a supported release to receive new features, bug fixes, and security updates.")
+        logger.warn("This release of #{ChefUtils::Dist::Infra::PRODUCT} became end of life (EOL) on May 1st #{eol_year}. Please update to a supported release to receive new features, bug fixes, and security updates.")
       end
     end
 
@@ -576,32 +571,6 @@ class Chef
       end
     end
 
-    #
-    # Populate the minimal ohai attributes defined in #run_ohai with data train collects.
-    #
-    # Eventually ohai may support colleciton of data.
-    #
-    def get_ohai_data_remotely
-      ohai.data[:fqdn] = if transport_connection.respond_to?(:hostname)
-                           transport_connection.hostname
-                         else
-                           Chef::Config[:target_mode][:host]
-                         end
-      if transport_connection.respond_to?(:os)
-        ohai.data[:platform] = transport_connection.os.name
-        ohai.data[:platform_version] = transport_connection.os.release
-        ohai.data[:os] = transport_connection.os.family_hierarchy[1]
-        ohai.data[:platform_family] = transport_connection.os.family
-      end
-      # train does not collect these specifically
-      # ohai.data[:machinename] = nil
-      # ohai.data[:hostname] = nil
-      # ohai.data[:os_version] = nil # kernel version
-
-      ohai.data[:ohai_time] = Time.now.to_f
-      events.ohai_completed(node)
-    end
-
     #
     # Run ohai plugins.  Runs all ohai plugins unless minimal_ohai is specified.
     #
@@ -614,6 +583,7 @@ class Chef
     #
     def run_ohai
       filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package} : nil
+      ohai.transport_connection = transport_connection if Chef::Config.target_mode?
       ohai.all_plugins(filter)
       events.ohai_completed(node)
     end
@@ -763,7 +733,7 @@ class Chef
         logger.trace("Checking for administrator privileges....")
 
         if !has_admin_privileges?
-          message = "#{Chef::Dist::CLIENT} doesn't have administrator privileges on node #{node_name}."
+          message = "#{ChefUtils::Dist::Infra::CLIENT} doesn't have administrator privileges on node #{node_name}."
           if Chef::Config[:fatal_windows_admin_check]
             logger.fatal(message)
             logger.fatal("fatal_windows_admin_check is set to TRUE.")
@@ -772,7 +742,7 @@ class Chef
             logger.warn("#{message} This might cause unexpected resource failures.")
           end
         else
-          logger.trace("#{Chef::Dist::CLIENT} has administrator privileges on node #{node_name}.")
+          logger.trace("#{ChefUtils::Dist::Infra::CLIENT} has administrator privileges on node #{node_name}.")
         end
       end
     end