chef 15.17.4-universal-mingw32 → 16.0.257-universal-mingw32

data/lib/chef/application/apply.rb

@@ -76,6 +76,12 @@ class Chef::Application::Apply < Chef::Application
     description: "Set the log level (trace, debug, info, warn, error, fatal).",
     proc: lambda { |l| l.to_sym }
 
+  option :always_dump_stacktrace,
+    long: "--[no-]always-dump-stacktrace",
+    boolean: true,
+    default: false,
+    description: "Always dump the stacktrace regardless of the log_level setting."
+
   option :help,
     short: "-h",
     long: "--help",
@@ -99,6 +105,12 @@ class Chef::Application::Apply < Chef::Application
     description: "Enable whyrun mode.",
     boolean: true
 
+  option :yaml,
+    long: "--yaml",
+    description: "Parse recipe as YAML",
+    boolean: true,
+    default: false
+
   option :profile_ruby,
     long: "--[no-]profile-ruby",
     description: "Dump complete Ruby call graph stack of entire #{Chef::Dist::PRODUCT} run (expert only).",
@@ -192,7 +204,12 @@ class Chef::Application::Apply < Chef::Application
       @recipe_text, @recipe_fh = read_recipe_file @recipe_filename
     end
     recipe, run_context = get_recipe_and_run_context
-    recipe.instance_eval(@recipe_text, @recipe_filename, 1)
+    if config[:yaml] || File.extname(@recipe_filename) == ".yml"
+      logger.info "Parsing recipe as YAML"
+      recipe.from_yaml(@recipe_text)
+    else
+      recipe.instance_eval(@recipe_text, @recipe_filename, 1)
+    end
     runner = Chef::Runner.new(run_context)
     catch(:end_client_run_early) do
       begin
@@ -215,8 +232,8 @@ class Chef::Application::Apply < Chef::Application
     Chef::Application.fatal!("#{e.class}: #{e.message}", e)
   end
 
-  # Get this party started
-  def run(enforce_license: false)
+    # Get this party started
+  def run(enforce_license = false)
     reconfigure
     check_license_acceptance if enforce_license
     run_application

data/lib/chef/application/base.rb

@@ -94,11 +94,16 @@ class Chef::Application::Base < Chef::Application
     description: "Set the log level (auto, trace, debug, info, warn, error, fatal).",
     proc: lambda { |l| l.to_sym }
 
-  option :log_location,
+  option :log_location_cli,
     short: "-L LOGLOCATION",
     long: "--logfile LOGLOCATION",
-    description: "Set the log file location, defaults to STDOUT - recommended for daemonizing.",
-    proc: nil
+    description: "Set the log file location, defaults to STDOUT - recommended for daemonizing."
+
+  option :always_dump_stacktrace,
+    long: "--[no-]always-dump-stacktrace",
+    boolean: true,
+    default: false,
+    description: "Always dump the stacktrace regardless of the log_level setting."
 
   option :help,
     short: "-h",

data/lib/chef/application/exit_code.rb

@@ -139,8 +139,8 @@ class Chef
         def notify_on_deprecation(message)
           Chef.deprecated(:exit_code, message)
         rescue Chef::Exceptions::DeprecatedFeatureError
-          # Have to rescue this, otherwise this unhandled error preempts
-          # the current exit code assignment.
+            # Have to rescue this, otherwise this unhandled error preempts
+            # the current exit code assignment.
         end
 
         def non_standard_exit_code_warning(exit_code)

data/lib/chef/application/knife.rb

@@ -46,7 +46,7 @@ class Chef::Application::Knife < Chef::Application
   option :verbosity,
     short: "-V",
     long: "--verbose",
-    description: "More verbose output. Use twice for max verbosity.",
+    description: "More verbose output. Use twice (-VV) for additional verbosity and three times (-VVV) for maximum verbosity.",
     proc: Proc.new { verbosity_level += 1 },
     default: 0
 

data/lib/chef/chef_class.rb

@@ -97,8 +97,8 @@ class Chef
     #
     # @return [Array<Class>] Modified Priority Array of Provider Classes to use for the resource_name on the node
     #
-    def set_provider_priority_array(resource_name, priority_array, *filter, &block)
-      result = provider_priority_map.set_priority_array(resource_name.to_sym, priority_array, *filter, &block)
+    def set_provider_priority_array(resource_name, priority_array, **filter, &block)
+      result = provider_priority_map.set_priority_array(resource_name.to_sym, priority_array, **filter, &block)
       result = result.dup if result
       result
     end
@@ -112,8 +112,8 @@ class Chef
     #
     # @return [Array<Class>] Modified Priority Array of Resource Classes to use for the resource_name on the node
     #
-    def set_resource_priority_array(resource_name, priority_array, *filter, &block)
-      result = resource_priority_map.set_priority_array(resource_name.to_sym, priority_array, *filter, &block)
+    def set_resource_priority_array(resource_name, priority_array, **filter, &block)
+      result = resource_priority_map.set_priority_array(resource_name.to_sym, priority_array, **filter, &block)
       result = result.dup if result
       result
     end

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -204,7 +204,7 @@ class Chef
           @memory_store.create(path, name, data, *options)
 
         elsif path[0] == "cookbooks" && path.length == 2
-        # Do nothing.  The entry gets created when the cookbook is created.
+          # Do nothing.  The entry gets created when the cookbook is created.
 
         # /policy_groups/GROUP/policies/NAME
         elsif path[0] == "policy_groups" && path[2] == "policies"
@@ -724,8 +724,8 @@ class Chef
             path[-1] = "#{path[-1]}.json"
           end
 
-        # /acls/containers|nodes|... do NOT drop into the next elsif, and do
-        # not get .json appended
+          # /acls/containers|nodes|... do NOT drop into the next elsif, and do
+          # not get .json appended
 
         # /nodes|clients|.../x.json
         elsif path.length == 2

data/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb

@@ -66,7 +66,7 @@ class Chef
           #   }
           # }
           def children
-            # Grab the names of the children, append json, and make child entries
+              # Grab the names of the children, append json, and make child entries
             @children ||= begin
               result = []
               data = root.get_json(api_path)

data/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb

@@ -71,7 +71,7 @@ class Chef
           # Children are foo.json and bar.json in this case.
           #
           def children
-            # Grab the names of the children, append json, and make child entries
+              # Grab the names of the children, append json, and make child entries
             @children ||= root.get_json(api_path).keys.sort.map do |key|
               make_child_entry(key, true)
             end

data/lib/chef/chef_fs/file_system/chef_server/rest_list_entry.rb

@@ -101,7 +101,7 @@ class Chef
 
           def read
             # Minimize the value (get rid of defaults) so the results don't look terrible
-            Chef::JSONCompat.to_json_pretty(minimize_value(_read_json))
+            Chef::JSONCompat.to_json_pretty(normalize_value(_read_json))
           end
 
           def _read_json
@@ -122,7 +122,11 @@ class Chef
           end
 
           def minimize_value(value)
-            data_handler.minimize(data_handler.normalize(value, self), self)
+            data_handler.minimize(normalize_value(value), self)
+          end
+
+          def normalize_value(value)
+            data_handler.normalize(value, self)
           end
 
           def compare_to(other)

data/lib/chef/chef_fs/file_system/multiplexed_dir.rb

@@ -19,7 +19,7 @@ class Chef
         def children
           result = []
           seen = {}
-          # If multiple things have the same name, the first one wins.
+            # If multiple things have the same name, the first one wins.
           multiplexed_dirs.each do |dir|
             dir.children.each do |child|
               if seen[child.name]

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

@@ -92,7 +92,6 @@ class Chef
           end
 
           attr_writer :write_pretty_json
-
           def write_pretty_json
             @write_pretty_json.nil? ? root.write_pretty_json : @write_pretty_json
           end

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

@@ -76,7 +76,7 @@ class Chef
 
             # Write out .uploaded-cookbook-version.json
             # cookbook_file_path = File.join(file_path, cookbook_name) <- this should be the same as self.file_path
-            unless File.exist?(file_path)
+            unless File.exists?(file_path)
               FileUtils.mkdir_p(file_path)
             end
             uploaded_cookbook_version_path = File.join(file_path, Chef::Cookbook::CookbookVersionLoader::UPLOADED_COOKBOOK_VERSION_FILE)
@@ -132,7 +132,7 @@ class Chef
           end
 
           def can_upload?
-            File.exist?(uploaded_cookbook_version_path) || children.size > 0
+            File.exists?(uploaded_cookbook_version_path) || children.size > 0
           end
 
           protected

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

@@ -137,7 +137,7 @@ class Chef
           end
 
           def exists?
-            File.exist?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
+            File.exists?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
           end
 
           def read

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

@@ -140,11 +140,11 @@ class Chef
           # Used to print out a human-readable file system description
           def fs_description
             repo_paths = root_paths || [ File.dirname(child_paths["cookbooks"][0]) ]
-            result = "repository at #{repo_paths.join(", ")}\n"
+            result = "repository at #{repo_paths.join(", ")}"
             if versioned_cookbooks
-              result << "  Multiple versions per cookbook\n"
+              result << " (Multiple versions per cookbook)"
             else
-              result << "  One version per cookbook\n"
+              result << " (One version per cookbook)"
             end
             child_paths.each_pair do |name, paths|
               if paths.any? { |path| !repo_paths.include?(File.dirname(path)) }
@@ -161,7 +161,7 @@ class Chef
           # members.json and org.json may be found.
           #
           def root_dir
-            existing_paths = root_paths.select { |path| File.exist?(path) }
+            existing_paths = root_paths.select { |path| File.exists?(path) }
             if existing_paths.size > 0
               MultiplexedDir.new(existing_paths.map do |path|
                 dir = FileSystemEntry.new(name, parent, path)
@@ -184,7 +184,7 @@ class Chef
               return root_dir.child(name)
             end
 
-            paths = (child_paths[name] || []).select { |path| File.exist?(path) }
+            paths = (child_paths[name] || []).select { |path| File.exists?(path) }
             if paths.size == 0
               return NonexistentFSObject.new(name, self)
             end

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

@@ -151,7 +151,7 @@ class Chef
           end
 
           def exists?
-            File.exist?(file_path)
+            File.exists?(file_path)
           end
 
           protected

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

@@ -122,7 +122,7 @@ class Chef
           end
 
           def exists?
-            File.exist?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
+            File.exists?(file_path) && (parent.nil? || parent.can_have_child?(name, dir?))
           end
 
           def read

data/lib/chef/chef_fs/path_utils.rb

@@ -71,9 +71,9 @@ class Chef
       # part that actually exists.  The paths operated on here are not Chef-FS paths.
       # These are OS paths that may contain symlinks but may not also fully exist.
       #
-      # If /x is a symlink to /foo_bar, and has no subdirectories, then:
-      # PathUtils.realest_path('/x/y/z') == '/foo_bar/y/z'
-      # PathUtils.realest_path('/x/*/z') == '/foo_bar/*/z'
+      # If /x is a symlink to /blarghle, and has no subdirectories, then:
+      # PathUtils.realest_path('/x/y/z') == '/blarghle/y/z'
+      # PathUtils.realest_path('/x/*/z') == '/blarghle/*/z'
       # PathUtils.realest_path('/*/y/z') == '/*/y/z'
       #
       # TODO: Move this to wherever util/path_helper is these days.

data/lib/chef/client.rb

@@ -327,8 +327,14 @@ class Chef
 
     # @api private
     def warn_if_eol
-      if Time.now > Time.new(2021, 5, 01)
-        logger.warn("This release of #{Chef::Dist::PRODUCT} became end of life (EOL) on May 1st 2021. Please update to a supported release to receive new features, bug fixes, and security updates.")
+      require_relative "version"
+
+      # We make a release every year so take the version you're on + 2006 and you get
+      # the year it goes EOL
+      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.")
       end
     end
 
@@ -347,19 +353,15 @@ class Chef
 
     # @api private
     def formatters_for_run
-      if Chef::Config.formatters.empty?
-        [default_formatter]
-      else
-        Chef::Config.formatters
-      end
-    end
+      return Chef::Config.formatters unless Chef::Config.formatters.empty?
 
-    # @api private
-    def default_formatter
-      if !Chef::Config[:force_logger] || Chef::Config[:force_formatter]
-        [:doc]
-      else
-        [:null]
+      [ Chef::Config[:log_location] ].flatten.map do |log_location|
+        log_location = nil if log_location == STDOUT
+        if !Chef::Config[:force_logger] || Chef::Config[:force_formatter]
+          [:doc, log_location]
+        else
+          [:null]
+        end
       end
     end
 

data/lib/chef/config.rb

@@ -56,7 +56,7 @@ class Chef
 
     default :event_loggers do
       evt_loggers = []
-      if ChefUtils.windows? && !Chef::Platform.windows_nano_server?
+      if ChefUtils.windows?
         evt_loggers << :win_evt
       end
       evt_loggers

data/lib/chef/cookbook/file_system_file_vendor.rb

@@ -27,7 +27,7 @@ class Chef
     # and throws the rest away then re-builds the list of files on the
     # disk. This is due to the manifest not having the on-disk file
     # locations, since in the chef-client case, that information is
-    # nonsensical.
+    # non-sensical.
     class FileSystemFileVendor < FileVendor
 
       attr_reader :cookbook_name

data/lib/chef/cookbook/gem_installer.rb

@@ -57,7 +57,7 @@ class Chef
           begin
             Dir.mktmpdir("chef-gem-bundle") do |dir|
               File.open("#{dir}/Gemfile", "w+") do |tf|
-                Array(Chef::Config[:rubygems_url] || "https://www.rubygems.org").each do |s|
+                Array(Chef::Config[:rubygems_url] || "https://rubygems.org").each do |s|
                   tf.puts "source '#{s}'"
                 end
                 cookbook_gems.each do |gem_name, args|

data/lib/chef/cookbook/metadata.rb

@@ -52,11 +52,13 @@ class Chef
       CHEF_VERSIONS          = "chef_versions".freeze
       OHAI_VERSIONS          = "ohai_versions".freeze
       GEMS                   = "gems".freeze
+      EAGER_LOAD_LIBRARIES   = "eager_load_libraries".freeze
 
       COMPARISON_FIELDS = %i{name description long_description maintainer
                             maintainer_email license platforms dependencies
                             providing recipes version source_url issues_url
-                            privacy chef_versions ohai_versions gems}.freeze
+                            privacy chef_versions ohai_versions gems
+                            eager_load_libraries}.freeze
 
       VERSION_CONSTRAINTS = { depends: DEPENDENCIES,
                               provides: PROVIDING,
@@ -109,6 +111,7 @@ class Chef
         @chef_versions = []
         @ohai_versions = []
         @gems = []
+        @eager_load_libraries = true
 
         @errors = []
       end
@@ -344,6 +347,25 @@ class Chef
         @gems
       end
 
+      # Metadata DSL to control the behavior of library loading.
+      #
+      # Can be set to:
+      #
+      # true   - libraries are eagerly loaded in alphabetical order (backcompat)
+      # false  - libraries are not eagerly loaded, the libraries dir is added to the LOAD_PATH
+      # String - a file or glob pattern to eagerly load, otherwise it is treated like `false`
+      # Array<String> - array of files or globs to eagerly load, otherwise it is treated like `false`
+      #
+      # @params arg [Array,String,TrueClass,FalseClass]
+      # @params [Array,TrueClass,FalseCalss]
+      def eager_load_libraries(arg = nil)
+        set_or_return(
+          :eager_load_libraries,
+          arg,
+          kind_of: [ Array, String, TrueClass, FalseClass ]
+        )
+      end
+
       # Adds a description for a recipe.
       #
       # === Parameters
@@ -435,6 +457,7 @@ class Chef
           CHEF_VERSIONS => gem_requirements_to_array(*chef_versions),
           OHAI_VERSIONS => gem_requirements_to_array(*ohai_versions),
           GEMS => gems,
+          EAGER_LOAD_LIBRARIES => eager_load_libraries,
         }
       end
 
@@ -458,7 +481,7 @@ class Chef
         @maintainer_email             = o[MAINTAINER_EMAIL] if o.key?(MAINTAINER_EMAIL)
         @license                      = o[LICENSE] if o.key?(LICENSE)
         @platforms                    = o[PLATFORMS] if o.key?(PLATFORMS)
-        @dependencies                 = handle_deprecated_constraints(o[DEPENDENCIES]) if o.key?(DEPENDENCIES)
+        @dependencies                 = handle_incorrect_constraints(o[DEPENDENCIES]) if o.key?(DEPENDENCIES)
         @providing                    = o[PROVIDING] if o.key?(PROVIDING)
         @recipes                      = o[RECIPES] if o.key?(RECIPES)
         @version                      = o[VERSION] if o.key?(VERSION)
@@ -468,6 +491,7 @@ class Chef
         @chef_versions                = gem_requirements_from_array("chef", o[CHEF_VERSIONS]) if o.key?(CHEF_VERSIONS)
         @ohai_versions                = gem_requirements_from_array("ohai", o[OHAI_VERSIONS]) if o.key?(OHAI_VERSIONS)
         @gems                         = o[GEMS] if o.key?(GEMS)
+        @eager_load_libraries         = o[EAGER_LOAD_LIBRARIES] if o.key?(EAGER_LOAD_LIBRARIES)
         self
       end
 
@@ -511,6 +535,25 @@ class Chef
         )
       end
 
+      # This method translates version constraint strings from
+      # cookbooks with the old format.
+      #
+      # Before we began respecting version constraints, we allowed
+      # multiple constraints to be placed on cookbooks, as well as the
+      # << and >> operators, which are now just < and >. For
+      # specifications with more than one constraint, we return an
+      # empty array (otherwise, we're silently abiding only part of
+      # the contract they have specified to us). If there is only one
+      # constraint, we are replacing the old << and >> with the new <
+      # and >.
+      def handle_incorrect_constraints(specification)
+        specification.inject(Mash.new) do |acc, (cb, constraints)|
+          constraints = Array(constraints)
+          acc[cb] = (constraints.empty? || constraints.size > 1) ? [] : constraints.first
+          acc
+        end
+      end
+
       # Sets the cookbook's issues URL, or returns it.
       #
       # === Parameters
@@ -714,26 +757,6 @@ class Chef
           end
         end
       end
-
-      # This method translates version constraint strings from
-      # cookbooks with the old format.
-      #
-      # Before we began respecting version constraints, we allowed
-      # multiple constraints to be placed on cookbooks, as well as the
-      # << and >> operators, which are now just < and >. For
-      # specifications with more than one constraint, we return an
-      # empty array (otherwise, we're silently abiding only part of
-      # the contract they have specified to us). If there is only one
-      # constraint, we are replacing the old << and >> with the new <
-      # and >.
-      def handle_deprecated_constraints(specification)
-        specification.inject(Mash.new) do |acc, (cb, constraints)|
-          constraints = Array(constraints)
-          acc[cb] = (constraints.empty? || constraints.size > 1) ? [] : constraints.first.gsub(/>>/, ">").gsub(/<</, "<")
-          acc
-        end
-      end
-
     end
 
     #== Chef::Cookbook::MinimalMetadata