chef 16.3.38-universal-mingw32 → 16.5.64-universal-mingw32

data/lib/chef/role.rb

@@ -256,11 +256,11 @@ class Chef
 
         js_path, rb_path = js_files.first, rb_files.first
 
-        if js_path && File.exists?(js_path)
+        if js_path && File.exist?(js_path)
           # from_json returns object.class => json_class in the JSON.
           hsh = Chef::JSONCompat.parse(IO.read(js_path))
           return from_hash(hsh)
-        elsif rb_path && File.exists?(rb_path)
+        elsif rb_path && File.exist?(rb_path)
           role = Chef::Role.new
           role.name(name)
           role.from_file(rb_path)

data/lib/chef/run_context.rb

@@ -28,7 +28,7 @@ require_relative "event_dispatch/events_output_stream"
 require_relative "train_transport"
 require_relative "exceptions"
 require "forwardable" unless defined?(Forwardable)
-require "set" unless defined?(Set)
+autoload :Set, "set"
 
 class Chef
 
@@ -627,7 +627,7 @@ class Chef
     # @return [Train::Plugins::Transport] The child class for our train transport.
     #
     def transport
-      @transport ||= Chef::TrainTransport.build_transport(logger)
+      @transport ||= Chef::TrainTransport.new(logger).build_transport
     end
 
     # Remote connection object from Train

data/lib/chef/run_context/cookbook_compiler.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "set" unless defined?(Set)
+autoload :Set, "set"
 require_relative "../log"
 require_relative "../recipe"
 require_relative "../resource/lwrp_base"
@@ -169,17 +169,17 @@ class Chef
       def compile_recipes
         @events.recipe_load_start(run_list_expansion.recipes.size)
         run_list_expansion.recipes.each do |recipe|
-          begin
-            path = resolve_recipe(recipe)
-            @run_context.load_recipe(recipe)
-            @events.recipe_file_loaded(path, recipe)
-          rescue Chef::Exceptions::RecipeNotFound => e
-            @events.recipe_not_found(e)
-            raise
-          rescue Exception => e
-            @events.recipe_file_load_failed(path, e, recipe)
-            raise
-          end
+
+          path = resolve_recipe(recipe)
+          @run_context.load_recipe(recipe)
+          @events.recipe_file_loaded(path, recipe)
+        rescue Chef::Exceptions::RecipeNotFound => e
+          @events.recipe_not_found(e)
+          raise
+        rescue Exception => e
+          @events.recipe_file_load_failed(path, e, recipe)
+          raise
+
         end
         @events.recipe_load_complete
       end
@@ -231,14 +231,14 @@ class Chef
 
       def load_libraries_from_cookbook(cookbook_name, globs = "**/*.rb")
         each_file_in_cookbook_by_segment(cookbook_name, :libraries, globs) do |filename|
-          begin
-            logger.trace("Loading cookbook #{cookbook_name}'s library file: #{filename}")
-            Kernel.require(filename)
-            @events.library_file_loaded(filename)
-          rescue Exception => e
-            @events.library_file_load_failed(filename, e)
-            raise
-          end
+
+          logger.trace("Loading cookbook #{cookbook_name}'s library file: #{filename}")
+          Kernel.require(filename)
+          @events.library_file_loaded(filename)
+        rescue Exception => e
+          @events.library_file_load_failed(filename, e)
+          raise
+
         end
       end
 
@@ -325,7 +325,7 @@ class Chef
 
       def count_files_by_segment(segment, root_alias = nil)
         cookbook_collection.inject(0) do |count, cookbook_by_name|
-          count + cookbook_by_name[1].segment_filenames(segment).size + (root_alias ? cookbook_by_name[1].files_for(:root_files).select { |record| record[:name] == root_alias }.size : 0)
+          count + cookbook_by_name[1].segment_filenames(segment).size + (root_alias ? cookbook_by_name[1].files_for(:root_files).count { |record| record[:name] == root_alias } : 0)
         end
       end
 

data/lib/chef/run_lock.rb

@@ -23,7 +23,7 @@ end
 require_relative "config"
 require_relative "exceptions"
 require "timeout" unless defined?(Timeout)
-require_relative "dist"
+require "chef-utils" unless defined?(ChefUtils)
 
 class Chef
 
@@ -96,7 +96,7 @@ class Chef
     # Waits until acquiring the system-wide lock.
     #
     def wait
-      Chef::Log.warn("#{Chef::Dist::PRODUCT} #{runpid} is running, will wait for it to finish and then run.")
+      Chef::Log.warn("#{ChefUtils::Dist::Infra::PRODUCT} #{runpid} is running, will wait for it to finish and then run.")
       if ChefUtils.windows?
         mutex.wait
       else

data/lib/chef/run_status.rb

@@ -25,17 +25,13 @@ class Chef::RunStatus
 
   attr_reader :events
 
-  attr_reader :run_context
-
-  attr_writer :run_context
+  attr_accessor :run_context
 
   attr_reader :start_time
 
   attr_reader :end_time
 
-  attr_reader :exception
-
-  attr_writer :exception
+  attr_accessor :exception
 
   attr_accessor :run_id
 

data/lib/chef/search/query.rb

@@ -20,8 +20,8 @@ require_relative "../config"
 require_relative "../exceptions"
 require_relative "../server_api"
 
-require "uri" unless defined?(URI)
-require "addressable/uri" unless defined?(Addressable::URI)
+autoload :URI, "uri"
+autoload :Addressable, "addressable/uri"
 
 class Chef
   class Search
@@ -132,10 +132,9 @@ class Chef
         args_h
       end
 
-      QUERY_PARAM_VALUE = Addressable::URI::CharacterClasses::QUERY + "\\&\\;"
-
       def escape_value(s)
-        s && Addressable::URI.encode_component(s.to_s, QUERY_PARAM_VALUE)
+        query_param_value = Addressable::URI::CharacterClasses::QUERY + "\\&\\;"
+        s && Addressable::URI.encode_component(s.to_s, query_param_value)
       end
 
       def create_query_string(type, query, rows, start)

data/lib/chef/server_api_versions.rb

@@ -51,6 +51,10 @@ class Chef
       @unversioned
     end
 
+    def negotiated?
+      !@versions.nil? || unversioned?
+    end
+
     def reset!
       @versions = nil
       @unversioned = false

data/lib/chef/shell.rb

@@ -15,17 +15,22 @@
 # limitations under the License.
 #
 
+module Mixlib
+  module Authentication
+    autoload :Log, "mixlib/authentication"
+  end
+end
 require "singleton" unless defined?(Singleton)
 require "pp" unless defined?(PP)
 require "etc" unless defined?(Etc)
 require "mixlib/cli" unless defined?(Mixlib::CLI)
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 require_relative "../chef"
 require_relative "version"
 require_relative "client"
 require_relative "config"
 require_relative "config_fetcher"
-require_relative "dist"
 
 require_relative "shell/shell_session"
 require_relative "workstation_config_loader"
@@ -126,11 +131,11 @@ module Shell
     irb_conf[:IRB_RC] = lambda do |conf|
       m = conf.main
 
-      conf.prompt_c       = "#{Chef::Dist::EXEC}#{leader(m)} > "
+      conf.prompt_c       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} > "
       conf.return_format  = " => %s \n"
-      conf.prompt_i       = "#{Chef::Dist::EXEC}#{leader(m)} (#{Chef::VERSION})> "
-      conf.prompt_n       = "#{Chef::Dist::EXEC}#{leader(m)} ?> "
-      conf.prompt_s       = "#{Chef::Dist::EXEC}#{leader(m)}%l> "
+      conf.prompt_i       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} (#{Chef::VERSION})> "
+      conf.prompt_n       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} ?> "
+      conf.prompt_s       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)}%l> "
       conf.use_tracer     = false
       conf.instance_variable_set(:@use_multiline, false)
       conf.instance_variable_set(:@use_singleline, false)
@@ -212,17 +217,17 @@ module Shell
       @footer
     end
 
-    banner("#{Chef::Dist::SHELL} #{Chef::VERSION}\n\nUsage: #{Chef::Dist::SHELL} [NAMED_CONF] (OPTIONS)")
+    banner("#{ChefUtils::Dist::Infra::SHELL} #{Chef::VERSION}\n\nUsage: #{ChefUtils::Dist::Infra::SHELL} [NAMED_CONF] (OPTIONS)")
 
     footer(<<~FOOTER)
-      When no CONFIG is specified, #{Chef::Dist::SHELL} attempts to load a default configuration file:
-      * If a NAMED_CONF is given, #{Chef::Dist::SHELL} will load ~/#{Chef::Dist::USER_CONF_DIR}/NAMED_CONF/#{Chef::Dist::SHELL_CONF}
-      * If no NAMED_CONF is given #{Chef::Dist::SHELL} will load ~/#{Chef::Dist::USER_CONF_DIR}/#{Chef::Dist::SHELL_CONF} if it exists
-      * If no #{Chef::Dist::SHELL_CONF} can be found, #{Chef::Dist::SHELL} falls back to load:
-            #{Chef::Dist::CONF_DIR}/client.rb if -z option is given.
-            #{Chef::Dist::CONF_DIR}/solo.rb   if --solo-legacy-mode option is given.
-            #{Chef::Dist::USER_CONF_DIR}/config.rb     if -s option is given.
-            #{Chef::Dist::USER_CONF_DIR}/knife.rb      if -s option is given.
+      When no CONFIG is specified, #{ChefUtils::Dist::Infra::SHELL} attempts to load a default configuration file:
+      * If a NAMED_CONF is given, #{ChefUtils::Dist::Infra::SHELL} will load ~/#{ChefUtils::Dist::Infra::USER_CONF_DIR}/NAMED_CONF/#{ChefUtils::Dist::Infra::SHELL_CONF}
+      * If no NAMED_CONF is given #{ChefUtils::Dist::Infra::SHELL} will load ~/#{ChefUtils::Dist::Infra::USER_CONF_DIR}/#{ChefUtils::Dist::Infra::SHELL_CONF} if it exists
+      * If no #{ChefUtils::Dist::Infra::SHELL_CONF} can be found, #{ChefUtils::Dist::Infra::SHELL} falls back to load:
+            #{ChefConfig::Config.etc_chef_dir}/client.rb if -z option is given.
+            #{ChefConfig::Config.etc_chef_dir}/solo.rb   if --solo-legacy-mode option is given.
+            #{ChefUtils::Dist::Infra::USER_CONF_DIR}/config.rb     if -s option is given.
+            #{ChefUtils::Dist::Infra::USER_CONF_DIR}/knife.rb      if -s option is given.
     FOOTER
 
     option :use_multiline,
@@ -269,19 +274,19 @@ module Shell
     option :solo_shell,
       short: "-s",
       long: "--solo",
-      description: "#{Chef::Dist::SOLO} session",
+      description: "#{ChefUtils::Dist::Solo::PRODUCT} session",
       boolean: true,
       proc: proc { Chef::Config[:solo] = true }
 
     option :client,
       short: "-z",
       long: "--client",
-      description: "#{Chef::Dist::PRODUCT} session",
+      description: "#{ChefUtils::Dist::Infra::PRODUCT} session",
       boolean: true
 
     option :solo_legacy_shell,
       long: "--solo-legacy-mode",
-      description: "#{Chef::Dist::SOLO} legacy session",
+      description: "#{ChefUtils::Dist::Solo::PRODUCT} legacy session",
       boolean: true,
       proc: proc { Chef::Config[:solo_legacy_mode] = true }
 
@@ -294,15 +299,15 @@ module Shell
     option :chef_server_url,
       short: "-S CHEFSERVERURL",
       long: "--server CHEFSERVERURL",
-      description: "The #{Chef::Dist::SERVER_PRODUCT} URL",
+      description: "The #{ChefUtils::Dist::Server::PRODUCT} URL",
       proc: nil
 
     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 :override_runlist,
@@ -339,7 +344,7 @@ module Shell
       config[:config_file] = config_file_for_shell_mode(environment)
       config_msg = config[:config_file] || "none (standalone session)"
       puts "loading configuration: #{config_msg}"
-      Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file])
+      Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exist?(config[:config_file]) && File.readable?(config[:config_file])
       Chef::Config.merge!(config)
     end
 
@@ -351,18 +356,18 @@ module Shell
         config[:config_file]
       elsif environment
         Shell.env = environment
-        config_file_to_try = ::File.join(dot_chef_dir, environment, Chef::Dist::SHELL_CONF)
+        config_file_to_try = ::File.join(dot_chef_dir, environment, ChefUtils::Dist::Infra::SHELL_CONF)
         unless ::File.exist?(config_file_to_try)
-          puts "could not find #{Chef::Dist::SHELL} config for environment #{environment} at #{config_file_to_try}"
+          puts "could not find #{ChefUtils::Dist::Infra::SHELL} config for environment #{environment} at #{config_file_to_try}"
           exit 1
         end
         config_file_to_try
-      elsif dot_chef_dir && ::File.exist?(File.join(dot_chef_dir, Chef::Dist::SHELL_CONF))
-        File.join(dot_chef_dir, Chef::Dist::SHELL_CONF)
+      elsif dot_chef_dir && ::File.exist?(File.join(dot_chef_dir, ChefUtils::Dist::Infra::SHELL_CONF))
+        File.join(dot_chef_dir, ChefUtils::Dist::Infra::SHELL_CONF)
       elsif config[:solo_legacy_shell]
-        Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/solo.rb")
+        Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/solo.rb")
       elsif config[:client]
-        Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/client.rb")
+        Chef::Config.platform_specific_path("#{ChefConfig::Config.etc_chef_dir}/client.rb")
       elsif config[:solo_shell]
         Chef::WorkstationConfigLoader.new(nil, Chef::Log).config_location
       else

data/lib/chef/shell/ext.rb

@@ -25,7 +25,7 @@ require_relative "shell_session"
 require_relative "model_wrapper"
 require_relative "../server_api"
 require_relative "../json_compat"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 module Shell
   module Extensions
@@ -69,7 +69,7 @@ module Shell
       def help_banner
         banner = []
         banner << ""
-        banner << "#{Chef::Dist::SHELL} Help"
+        banner << "#{ChefUtils::Dist::Infra::SHELL} Help"
         banner << "".ljust(80, "=")
         banner << "| " + "Command".ljust(25) + "| " + "Description"
         banner << "".ljust(80, "=")
@@ -194,7 +194,7 @@ module Shell
       explain(<<~E)
         ## SUMMARY ##
           When called with no argument, +help+ prints a table of all
-          #{Chef::Dist::SHELL} commands. When called with an argument COMMAND, +help+
+          #{ChefUtils::Dist::Infra::SHELL} commands. When called with an argument COMMAND, +help+
           prints a detailed explanation of the command if available, or the
           description if no explanation is available.
       E
@@ -208,9 +208,9 @@ module Shell
       end
       alias :halp :help
 
-      desc "prints information about #{Chef::Dist::PRODUCT}"
+      desc "prints information about #{ChefUtils::Dist::Infra::PRODUCT}"
       def version
-        puts "Welcome to the #{Chef::Dist::SHELL} #{::Chef::VERSION}\n" +
+        puts "Welcome to the #{ChefUtils::Dist::Infra::SHELL} #{::Chef::VERSION}\n" +
           "For usage see https://docs.chef.io/chef_shell/"
         :ucanhaz_automation
       end
@@ -228,7 +228,7 @@ module Shell
         :attributes
       end
 
-      desc "run #{Chef::Dist::PRODUCT} using the current recipe"
+      desc "run #{ChefUtils::Dist::Infra::PRODUCT} using the current recipe"
       def run_chef
         Chef::Log.level = :debug
         session = Shell.session
@@ -237,8 +237,8 @@ module Shell
         runrun
       end
 
-      desc "returns an object to control a paused #{Chef::Dist::PRODUCT} run"
-      subcommands resume: "resume the #{Chef::Dist::PRODUCT} run",
+      desc "returns an object to control a paused #{ChefUtils::Dist::Infra::PRODUCT} run"
+      subcommands resume: "resume the #{ChefUtils::Dist::Infra::PRODUCT} run",
                   step: "run only the next resource",
                   skip_back: "move back in the run list",
                   skip_forward: "move forward in the run list"
@@ -309,9 +309,9 @@ module Shell
               new_node = edit(existing_node)
 
         ## EDITOR SELECTION ##
-          #{Chef::Dist::SHELL} looks for an editor using the following logic
+          #{ChefUtils::Dist::Infra::SHELL} looks for an editor using the following logic
           1. Looks for an EDITOR set by Shell.editor = "EDITOR"
-          2. Looks for an EDITOR configured in your #{Chef::Dist::SHELL} config file
+          2. Looks for an EDITOR configured in your #{ChefUtils::Dist::Infra::SHELL} config file
           3. Uses the value of the EDITOR environment variable
       E
       def edit(object)
@@ -320,7 +320,7 @@ module Shell
           return :failburger
         end
 
-        filename = "#{Chef::Dist::SHELL}-edit-#{object.class.name}-"
+        filename = "#{ChefUtils::Dist::Infra::SHELL}-edit-#{object.class.name}-"
         if object.respond_to?(:name)
           filename += object.name
         elsif object.respond_to?(:id)

data/lib/chef/shell/shell_session.rb

@@ -28,7 +28,7 @@ require_relative "../run_list/run_list_expansion"
 require_relative "../formatters/base"
 require_relative "../formatters/doc"
 require_relative "../formatters/minimal"
-require_relative "../dist"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 
 module Shell
   class ShellSession
@@ -90,7 +90,7 @@ module Shell
     end
 
     def save_node
-      raise "Not Supported! #{self.class.name} doesn't support #save_node, maybe you need to run #{Chef::Dist::SHELL} in client mode?"
+      raise "Not Supported! #{self.class.name} doesn't support #save_node, maybe you need to run #{ChefUtils::Dist::Infra::SHELL} in client mode?"
     end
 
     def rebuild_context

data/lib/chef/train_transport.rb

@@ -15,114 +15,15 @@
 # limitations under the License.
 #
 
-require "chef-config/mixin/credentials"
-require "train"
-require_relative "dist"
+require "chef-config/mixin/train_transport" unless defined?(ChefConfig::Mixin::TrainTransport)
 
 class Chef
   class TrainTransport
-    extend ChefConfig::Mixin::Credentials
+    include ChefConfig::Mixin::TrainTransport
 
-    #
-    # Returns a RFC099 credentials profile as a hash
-    #
-    def self.load_credentials(profile)
-      # Tomlrb.load_file returns a hash with keys as strings
-      credentials = parse_credentials_file
-      if contains_split_fqdn?(credentials, profile)
-        Chef::Log.warn("Credentials file #{credentials_file_path} contains target '#{profile}' as a Hash, expected a string.")
-        Chef::Log.warn("Hostnames must be surrounded by single quotes, e.g. ['host.example.org']")
-      end
-
-      # host names must be specified in credentials file as ['foo.example.org'] with quotes
-      if !credentials.nil? && !credentials[profile].nil?
-        credentials[profile].map { |k, v| [k.to_sym, v] }.to_h # return symbolized keys to match Train.options()
-      else
-        nil
-      end
-    end
-
-    # Toml creates hashes when a key is separated by periods, e.g.
-    # [host.example.org] => { host: { example: { org: {} } } }
-    #
-    # Returns true if the above example is true
-    #
-    # A hostname has to be specified as ['host.example.org']
-    # This will be a common mistake so we should catch it
-    #
-    def self.contains_split_fqdn?(hash, fqdn)
-      fqdn.split(".").reduce(hash) do |h, k|
-        v = h[k]
-        if Hash === v
-          v
-        else
-          break false
-        end
-      end
-    end
-
-    # ChefConfig::Mixin::Credentials.credentials_file_path is designed around knife,
-    # overriding it here.
-    #
-    # Credentials file preference:
-    #
-    # 1) target_mode.credentials_file
-    # 2) /etc/chef/TARGET_MODE_HOST/credentials
-    # 3) #credentials_file_path from parent ($HOME/.chef/credentials)
-    #
-    def self.credentials_file_path
-      tm_config = Chef::Config.target_mode
-      profile = tm_config.host
-
-      credentials_file =
-        if tm_config.credentials_file && File.exist?(tm_config.credentials_file)
-          tm_config.credentials_file
-        elsif File.exist?(Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/#{profile}/credentials"))
-          Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/#{profile}/credentials")
-        else
-          super
-        end
-
-      raise ArgumentError, "No credentials file found for target '#{profile}'" unless credentials_file
-      raise ArgumentError, "Credentials file specified for target mode does not exist: '#{credentials_file}'" unless File.exist?(credentials_file)
-
-      Chef::Log.debug("Loading credentials file '#{credentials_file}' for target '#{profile}'")
-
-      credentials_file
-    end
-
-    def self.build_transport(logger = Chef::Log.with_child(subsystem: "transport"))
-      return nil unless Chef::Config.target_mode?
-
-      # TODO: Consider supporting parsing the protocol from a URI passed to `--target`
-      #
-      train_config = {}
-
-      # Load the target_mode config context from Chef::Config, and place any valid settings into the train configuration
-      tm_config = Chef::Config.target_mode
-      protocol = tm_config.protocol
-      train_config = tm_config.to_hash.select { |k| Train.options(protocol).key?(k) }
-      Chef::Log.trace("Using target mode options from #{Chef::Dist::PRODUCT} config file: #{train_config.keys.join(", ")}") if train_config
-
-      # Load the credentials file, and place any valid settings into the train configuration
-      credentials = load_credentials(tm_config.host)
-      if credentials
-        valid_settings = credentials.select { |k| Train.options(protocol).key?(k) }
-        valid_settings[:enable_password] = credentials[:enable_password] if credentials.key?(:enable_password)
-        train_config.merge!(valid_settings)
-        Chef::Log.trace("Using target mode options from credentials file: #{valid_settings.keys.join(", ")}") if valid_settings
-      end
-
-      train_config[:logger] = logger
-
-      # Train handles connection retries for us
-      Train.create(protocol, train_config)
-    rescue SocketError => e # likely a dns failure, not caught by train
-      e.message.replace "Error connecting to #{train_config[:target]} - #{e.message}"
-      raise e
-    rescue Train::PluginLoadError
-      logger.error("Invalid target mode protocol: #{protocol}")
-      exit(false)
+    def config
+      require "chef/config" unless defined?(Chef::Config)
+      Chef::Config
     end
   end
 end