chef 16.0.287-universal-mingw32 → 16.2.73-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1352baaafdadf59913e7973a1c52ead1fa8adcdde5d844118393409c545f512
-  data.tar.gz: '09c4450fbc67d1059c9c8b1def5697acf90280bc95005031000bdea6c04aa35a'
+  metadata.gz: 3e032c1572a1691f3496d92bd9a9c2b89cec425037583d8d911cdfaa379aa8ff
+  data.tar.gz: 454f454361c2c8a998275a14d8bfa6da74867e9213091923cf52c69f4a1df098
 SHA512:
-  metadata.gz: 0fe3a34cd5e9563490331baab2acdddc680234113d870ed8d22887233e6899ea4faa9fe645916935be6906cd5417f59b3919651a5a0757f529fe766392420756
-  data.tar.gz: 65f25ac64ac1c1c9a2907052aa6576d9421357e34ac9300038d9ca2cd4ebefe33154857b24fa56ae055655ff49a2a8aee808bcd6f0b405dc664cacdb0844477a
+  metadata.gz: a701a20dea62009da9d384ba2f488cfcdc5b515da515329f4ff9d19d6ff3fe60a8167cd137b7544d58f0db251a27b51bbc77926ea932ed6385363080bb3ed825
+  data.tar.gz: 1ab9c7cc9979aca504d9a268c1908f45c958935355a3b36dad3b2e4e9f1255afc2624feec6bde66e12e7978664b42b2a4683d236edca81555cebeebe3ebd8b7f

data/Gemfile

@@ -22,8 +22,7 @@ end
 
 gem "cheffish", ">= 14"
 
-# avoid bringing in the new http 4 gem that comes with other ffi baggage which breaks builds
-gem "chef-telemetry", "=1.0.3"
+gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep
 
 group(:omnibus_package) do
   gem "appbundler"
@@ -85,7 +84,7 @@ eval_gemfile("./Gemfile.local") if File.exist?("./Gemfile.local")
 #
 # We copy (and overwrite) these files every time "bundle <exec|install>" is
 # executed, just in case they have changed.
-if RUBY_PLATFORM =~ /mswin|mingw|windows/
+if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
   instance_eval do
     ruby_exe_dir = RbConfig::CONFIG["bindir"]
     assemblies = Dir.glob(File.expand_path("distro/ruby_bin_folder", Dir.pwd) + "/*.dll")

data/README.md

@@ -18,7 +18,7 @@ Chef Infra is a configuration management tool designed to bring automation to yo
 
 ### Want to try Chef Infra?
 
-For Chef Infra usage, please refer to our [Learn Chef Rally](https://learn.chef.io/) website, which includes module-based training for Chef Infra, as well as Automate, Habitat, and InSpec.
+For Chef Infra usage, please refer to [Learn Chef](https://learn.chef.io/), our self-paced, entirely free learning platform. Learn Chef also includes module-based training for Chef Infra, as well as Chef Automate, Chef Habitat, and Chef InSpec.
 
 Other useful resources for Chef Infra users:
 
@@ -26,7 +26,7 @@ Other useful resources for Chef Infra users:
 - Source: <https://github.com/chef/chef/tree/master>
 - Tickets/Issues: <https://github.com/chef/chef/issues>
 - Slack: [Chef Community Slack](https://community-slack.chef.io/)
-- Mailing list: <https://discourse.chef.io>
+- Mailing list/Forum: <https://discourse.chef.io>
 
 ## Reporting Issues
 
@@ -46,7 +46,7 @@ We'd love to have your help developing Chef Infra. See our [Contributing Documen
 
 ## License and Copyright
 
-Copyright 2008-2019, Chef Software, Inc.
+Copyright 2008-2020, Chef Software, Inc.
 
 ```
 Licensed under the Apache License, Version 2.0 (the "License");

data/Rakefile

@@ -25,6 +25,7 @@ begin
   require_relative "tasks/dependencies"
   require_relative "tasks/announce"
   require_relative "tasks/docs"
+  require_relative "tasks/spellcheck"
   require_relative "lib/chef/dist"
 rescue LoadError => e
   puts "Skipping missing rake dep: #{e}"
@@ -58,7 +59,7 @@ namespace :pre_install do
   task all: ["pre_install:install_gems_from_dirs", "pre_install:render_powershell_extension"]
 end
 
-# hack in all the preinstall tasks to occur before the tradtional install task
+# hack in all the preinstall tasks to occur before the traditional install task
 task install: "pre_install:all"
 
 # make sure we build the correct gemspec on windows
@@ -107,4 +108,4 @@ begin
   end
 rescue LoadError
   puts "yard is not available. bundle install first to make sure all dependencies are installed."
-end
+end

data/chef.gemspec

@@ -28,19 +28,19 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 16.0"
 
-  s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"
+  s.add_dependency "ffi", ">= 1.9.25"
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "net-ssh", ">= 4.2", "< 6"
+  s.add_dependency "net-ssh", ">= 4.2", "< 7"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
-  s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
+  s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0"
   s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
   s.add_dependency "bcrypt_pbkdf", "= 1.1.0.rc1" # ed25519 ssh key support
   s.add_dependency "highline", ">= 1.6.9", "< 3"
   s.add_dependency "tty-screen", "~> 0.6" # knife list
   s.add_dependency "pastel" # knife ui.color
   s.add_dependency "erubis", "~> 2.7"
-  s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
-  s.add_dependency "ffi-libarchive"
+  s.add_dependency "diff-lcs", ">= 1.2.4", "< 1.4.0" # 1.4 breaks output
+  s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3"
   s.add_dependency "chef-zero", ">= 14.0.11"
   s.add_dependency "chef-vault"
 

data/distro/powershell/chef/chef.psm1

@@ -358,7 +358,7 @@ function Run-RubyCommand($command, $argList) {
   # When arguments come into this method, the standard PS rules for interpreting cmdlet arguments
   # apply.  When using & (call operator) and providing an array of arguments, powershell (verified
   # on PS 4.0 on Windows Server 2012R2) will not evaluate them but (contrary to documentation),
-  # it will still marginally interpret them.  The behaviour of PS 5.0 seems to be different but
+  # it will still marginally interpret them.  The behavior of PS 5.0 seems to be different but
   # ignore that for now.  If any of the provided arguments has a space in it, powershell checks
   # the first and last character to ensure that they are " characters (and that's all it checks).
   # If they are not, it will blindly surround that argument with " characters.  It won't do this
@@ -381,10 +381,10 @@ function Run-RubyCommand($command, $argList) {
   # Command line:
   # "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe"  "foo '' bar "baz"" "foo '' bar "baz""
   #
-  # $x = "abc'123'nospace`"lulz`"!!!"
+  # $x = "abc'123'nospace`"lol`"!!!"
   # & EchoArgs @($x, $x)
   # Command line:
-  # "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe"  abc'123'nospace"lulz"!!! abc'123'nospace"lulz"!!!
+  # "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe"  abc'123'nospace"lol"!!! abc'123'nospace"lol"!!!
   #
   # $x = "`"`"Look ma! Tonnes of spaces! 'foo' 'bar'`"`""
   # & EchoArgs @($x, $x)

data/distro/templates/powershell/chef/chef.psm1.erb

@@ -358,7 +358,7 @@ function Run-RubyCommand($command, $argList) {
   # When arguments come into this method, the standard PS rules for interpreting cmdlet arguments
   # apply.  When using & (call operator) and providing an array of arguments, powershell (verified
   # on PS 4.0 on Windows Server 2012R2) will not evaluate them but (contrary to documentation),
-  # it will still marginally interpret them.  The behaviour of PS 5.0 seems to be different but
+  # it will still marginally interpret them.  The behavior of PS 5.0 seems to be different but
   # ignore that for now.  If any of the provided arguments has a space in it, powershell checks
   # the first and last character to ensure that they are " characters (and that's all it checks).
   # If they are not, it will blindly surround that argument with " characters.  It won't do this
@@ -381,10 +381,10 @@ function Run-RubyCommand($command, $argList) {
   # Command line:
   # "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe"  "foo '' bar "baz"" "foo '' bar "baz""
   #
-  # $x = "abc'123'nospace`"lulz`"!!!"
+  # $x = "abc'123'nospace`"lol`"!!!"
   # & EchoArgs @($x, $x)
   # Command line:
-  # "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe"  abc'123'nospace"lulz"!!! abc'123'nospace"lulz"!!!
+  # "C:\Program Files (x86)\PowerShell Community Extensions\Pscx3\Pscx\Apps\EchoArgs.exe"  abc'123'nospace"lol"!!! abc'123'nospace"lol"!!!
   #
   # $x = "`"`"Look ma! Tonnes of spaces! 'foo' 'bar'`"`""
   # & EchoArgs @($x, $x)

data/lib/chef/application/apply.rb

@@ -21,6 +21,7 @@ require_relative "../../chef"
 require_relative "../application"
 require_relative "../client"
 require_relative "../config"
+require_relative "../config_fetcher"
 require_relative "../log"
 require "fileutils" unless defined?(FileUtils)
 require "tempfile" unless defined?(Tempfile)
@@ -233,7 +234,7 @@ class Chef::Application::Apply < Chef::Application
   end
 
   # Get this party started
-  def run(enforce_license = false)
+  def run(enforce_license: false)
     reconfigure
     check_license_acceptance if enforce_license
     run_application

data/lib/chef/application/base.rb

@@ -363,7 +363,7 @@ class Chef::Application::Base < Chef::Application
     Chef::Log.trace("Download recipes tarball from #{url} to #{path}")
     if File.exist?(url)
       FileUtils.cp(url, path)
-    elsif url =~ URI.regexp
+    elsif URI.regexp.match?(url)
       File.open(path, "wb") do |f|
         open(url) do |r|
           f.write(r.read)

data/lib/chef/application/client.rb

@@ -39,7 +39,7 @@ class Chef::Application::Client < Chef::Application::Base
       long: "--daemonize [WAIT]",
       description: "Daemonize the process. Accepts an optional integer which is the " \
         "number of seconds to wait before the first daemonized run.",
-      proc: lambda { |wait| wait =~ /^\d+$/ ? wait.to_i : true }
+      proc: lambda { |wait| /^\d+$/.match?(wait) ? wait.to_i : true }
   end
 
   option :pid_file,

data/lib/chef/application/windows_service_manager.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
   require "win32/service"
 end
 require_relative "../config"

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

@@ -55,7 +55,7 @@ class Chef
           base_name = remove_dot_json(entry.name)
           if object["raw_data"]["id"] != base_name
             yield("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object["raw_data"]["id"]}')")
-          elsif entry.parent.name =~ RESERVED_NAMES
+          elsif RESERVED_NAMES.match?(entry.parent.name)
             yield("Data bag name ('#{entry.parent.name}') must not match #{RESERVED_NAMES.inspect}")
           end
         end

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

@@ -60,7 +60,7 @@ class Chef
                   AclDir.new(entity_type, self)
                 end
               end
-              @children << AclEntry.new("organization.json", self, true) # the org acl is retrieved as GET /organizations/ORGNAME/ANYTHINGATALL/_acl
+              @children << AclEntry.new("organization.json", self, true) # the org acl is retrieved as GET /organizations/ORGNAME/ANYTHING/_acl
             end
             @children
           end

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

@@ -18,7 +18,7 @@
 
 require_relative "../base_fs_object"
 require_relative "../../../http/simple"
-require "openssl" unless defined?(OpenSSL)
+require "digest" unless defined?(Digest)
 
 class Chef
   module ChefFS
@@ -69,7 +69,7 @@ class Chef
           private
 
           def calc_checksum(value)
-            OpenSSL::Digest::MD5.hexdigest(value)
+            ::Digest::MD5.hexdigest(value)
           end
         end
       end

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

@@ -104,7 +104,7 @@ class Chef
             children.empty?
           end
 
-          # Public API callied by chef_fs/file_system
+          # Public API called by chef_fs/file_system
           def child(name)
             possible_child = make_child_entry(name)
             if possible_child.name_valid?

data/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb

@@ -235,7 +235,7 @@ class Chef
         # The order of these checks is important, as well, to be thread safe.
         # 1. If @unconsumed_input.empty? is true, then we will never have any more
         # work legitimately picked up.
-        # 2. If @in_process == 0, then there is no work in process, and because ofwhen unconsumed_input is empty, it will never go back up, because
+        # 2. If @in_process == 0, then there is no work in process, and because of when unconsumed_input is empty, it will never go back up, because
         # this is called after the input enumerator is finished.  Note that switching #2 and #1
         # could cause a race, because in_process is incremented *before* consuming input.
         # 3. If @unconsumed_output.empty? is true, then we are done with outputs.

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 /blarghle, and has no subdirectories, then:
-      # PathUtils.realest_path('/x/y/z') == '/blarghle/y/z'
-      # PathUtils.realest_path('/x/*/z') == '/blarghle/*/z'
+      # 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'
       # PathUtils.realest_path('/*/y/z') == '/*/y/z'
       #
       # TODO: Move this to wherever util/path_helper is these days.
@@ -118,7 +118,7 @@ class Chef
 
         if ancestor.length == path.length
           ""
-        elsif path[ancestor.length, 1] =~ /#{PathUtils.regexp_path_separator}/
+        elsif /#{PathUtils.regexp_path_separator}/.match?(path[ancestor.length, 1])
           path[ancestor.length + 1..-1]
         else
           nil

data/lib/chef/cookbook/chefignore.rb

@@ -50,7 +50,7 @@ class Chef
         ignore_globs = []
         if @ignore_file && readable_file_or_symlink?(@ignore_file)
           File.foreach(@ignore_file) do |line|
-            ignore_globs << line.strip unless line =~ COMMENTS_AND_WHITESPACE
+            ignore_globs << line.strip unless COMMENTS_AND_WHITESPACE.match?(line)
           end
         else
           Chef::Log.debug("No chefignore file found. No files will be ignored!")

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
-    # non-sensical.
+    # nonsensical.
     class FileSystemFileVendor < FileVendor
 
       attr_reader :cookbook_name

data/lib/chef/cookbook/metadata.rb

@@ -357,7 +357,7 @@ class Chef
       # 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]
+      # @params [Array,TrueClass,FalseClass]
       def eager_load_libraries(arg = nil)
         set_or_return(
           :eager_load_libraries,
@@ -391,7 +391,7 @@ class Chef
       def recipes_from_cookbook_version(cookbook)
         cookbook.fully_qualified_recipe_names.map do |recipe_name|
           unqualified_name =
-            if recipe_name =~ /::default$/
+            if /::default$/.match?(recipe_name)
               name.to_s
             else
               recipe_name

data/lib/chef/cookbook_loader.rb

@@ -138,7 +138,7 @@ class Chef
       cookbooks_by_name.values
     end
 
-    # This method creates tmp directory and copies all cookbooks into it and creates cookbook loder object which points to tmp directory
+    # This method creates tmp directory and copies all cookbooks into it and creates cookbook loader object which points to tmp directory
     def self.copy_to_tmp_dir_from_array(cookbooks)
       tmp_cookbook_file = Tempfile.new("tmp_working_dir_path")
       tmp_cookbook_file.close

data/lib/chef/cookbook_manifest.rb

@@ -44,7 +44,7 @@ class Chef
     # cookbook_version in the "manifest" format, or #to_json to get a JSON
     # representation of the cookbook_version.
     #
-    # The inferface for this behavior is expected to change as we implement new
+    # The interface for this behavior is expected to change as we implement new
     # manifest formats. The entire class should be considered a private API for
     # now.
     #

data/lib/chef/cookbook_site_streaming_uploader.rb

@@ -147,7 +147,7 @@ class Chef
         class << res
           alias :to_s :body
 
-          # BUGBUG this makes the response compatible with what respsonse_steps expects to test headers (response.headers[] -> response[])
+          # BUG this makes the response compatible with what response_steps expects to test headers (response.headers[] -> response[])
           def headers # rubocop:disable Lint/NestedMethodDefinition
             self
           end

data/lib/chef/cookbook_version.rb

@@ -358,7 +358,7 @@ class Chef
 
         # extract the preference part from the path.
         if manifest_record_path =~ %r{(#{Regexp.escape(segment.to_s)}/[^/]+/#{Regexp.escape(dirname)})/.+$}
-          # Note the specificy_dirname includes the segment and
+          # Note the specificity_dirname includes the segment and
           # dirname argument as above, which is what
           # preferences_for_path returns. It could be
           # "files/ubuntu-9.10/dirname", for example.
@@ -392,7 +392,7 @@ class Chef
                                    platform, version = Chef::Platform.find_platform_and_version(node)
                                  rescue ArgumentError => e
                                    # Skip platform/version if they were not found by find_platform_and_version
-                                   if e.message =~ /Cannot find a (?:platform|version)/
+                                   if /Cannot find a (?:platform|version)/.match?(e.message)
                                      platform = "/unknown_platform/"
                                      version = "/unknown_platform_version/"
                                    else
@@ -527,7 +527,7 @@ class Chef
         cb["version"]
       end
     rescue Net::HTTPClientException => e
-      if e.to_s =~ /^404/
+      if /^404/.match?(e.to_s)
         Chef::Log.error("Cannot find a cookbook named #{cookbook_name}")
         nil
       else
@@ -566,7 +566,7 @@ class Chef
     def find_preferred_manifest_record(node, segment, filename)
       preferences = preferences_for_path(node, segment, filename)
 
-      # in order of prefernce, look for the filename in the manifest
+      # in order of preference, look for the filename in the manifest
       preferences.find { |preferred_filename| manifest_records_by_path[preferred_filename] }
     end
 

data/lib/chef/data_bag.rb

@@ -36,10 +36,10 @@ class Chef
     RESERVED_NAMES = /^(node|role|environment|client)$/.freeze
 
     def self.validate_name!(name)
-      unless name =~ VALID_NAME
+      unless VALID_NAME.match?(name)
         raise Exceptions::InvalidDataBagName, "DataBags must have a name matching #{VALID_NAME.inspect}, you gave #{name.inspect}"
       end
-      if name =~ RESERVED_NAMES
+      if RESERVED_NAMES.match?(name)
         raise Exceptions::InvalidDataBagName, "DataBags may not have a name matching #{RESERVED_NAMES.inspect}, you gave #{name.inspect}"
       end
     end
@@ -94,7 +94,7 @@ class Chef
         names = []
         paths.each do |path|
           unless File.directory?(path)
-            raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' is invalid"
+            raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' not found. Please create this directory."
           end
 
           names += Dir.glob(File.join(
@@ -122,7 +122,7 @@ class Chef
         data_bag = {}
         paths.each do |path|
           unless File.directory?(path)
-            raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' is invalid"
+            raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{path}' not found. Please create this directory."
           end
 
           Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path, name.to_s), "*.json")).inject({}) do |bag, f|

data/lib/chef/data_collector.rb

@@ -184,7 +184,7 @@ class Chef
         begin
           code = e&.response&.code&.to_s
         rescue
-          # i really dont care
+          # i really don't care
         end
 
         code ||= "No HTTP Code"

data/lib/chef/data_collector/error_handlers.rb

@@ -18,7 +18,7 @@
 class Chef
   class DataCollector
 
-    # This module isolates the handling of collecting error descriptions to insert into the data_colletor
+    # This module isolates the handling of collecting error descriptions to insert into the data_collector
     # report output.  For very early errors it is responsible for collecting the node_name for the report
     # to use.  For all failure conditions that have an ErrorMapper it collects the output.
     #

data/lib/chef/decorator/lazy_array.rb

@@ -21,8 +21,8 @@ class Chef
   class Decorator
     # Lazy Array around Lazy Objects
     #
-    # This only lazys access through `#[]`.  In order to implement #each we need to
-    # know how many items we have and what their indexes are, so we'd have to evalute
+    # This makes access lazy through `#[]`.  In order to implement #each we need to
+    # know how many items we have and what their indexes are, so we'd have to evaluate
     # the proc which makes that impossible.  You can call methods like #each and the
     # decorator will forward the method, but item access will not be lazy.
     #

data/lib/chef/deprecated.rb

@@ -237,6 +237,10 @@ class Chef
       target 29
     end
 
+    class ArchiveFileIntegerFileMode < Base
+      target 30
+    end
+
     class Generic < Base
       def url
         "https://docs.chef.io/chef_deprecations_client/"