chef 16.17.51 → 16.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2ce3e90bf16cdc6e45a5d38437ac5c09ddf28a932941d15e41cefb63799c5e
-  data.tar.gz: 62836ee773fddcf98d3754f493140c32ed700f4a8579bfd6635999033993f544
+  metadata.gz: a65b4755816a9d5a1920b8f73627c07a6fadb7bc0d1f1132507ac3f547f289c8
+  data.tar.gz: 50671c4259fc3d44a1794ba13759bea7c317129615c027272b9905947cc238dd
 SHA512:
-  metadata.gz: 1829789a8720ead98555f765b1d3888e48f34be72490bdd39dc7d98459a1bab97f17818f3163ff52915c03e0e079e391c8751bcabaf6988250fd8ffa29d02e1b
-  data.tar.gz: d79cb28151cc22cfb1d924f88c655b058c5fa5a1e89bcb540816b80599415bb8e5346058a6da8cb35487bb32f74fd9f3f7d3a78f51fa2a78931e82ebb1ba700a
+  metadata.gz: eaaeb74c2d30b9bd21c8e777dc696730570a2901e60507feb65953324cff90cc4e7f1fb182f77a6bfdb02a238e05a709b872777fbe5aed062030fa5d9133a67d
+  data.tar.gz: 287087f0edecb64d7feeae4dddff412d26ec3579ad6e3eeaad33ab0a4b1e2d3d1b32eb9f31ac85f13e42e78e6c23f019e5f09dd34220ef92e90e31dd89d15817

data/lib/chef/client.rb

@@ -327,12 +327,12 @@ class Chef
     def warn_if_eol
       require_relative "version"
 
-      # We make a release every year so take the version you're on + 2006 and you get
+      # We make a release every year so take the version you're on + 2007 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 #{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.")
+      if Time.now > Time.new(eol_year, 11, 30)
+        logger.warn("This release of #{ChefUtils::Dist::Infra::PRODUCT} became end of life (EOL) on November 30th #{eol_year}. Please update to a supported release to receive new features, bug fixes, and security updates.")
       end
     end
 

data/lib/chef/node/attribute.rb

@@ -450,17 +450,34 @@ class Chef
       # method-style access to attributes (has to come after the prepended ImmutablizeHash)
 
       def read(*path)
-        merged_attributes.read(*path)
+        if path[0].nil?
+          Chef::Log.warn "Calling node.read() without any path argument is very slow, probably a bug, and should be avoided"
+          merged_attributes.read(*path) # re-merges everything, slow edge case
+        else
+          self[path[0]] unless path[0].nil? # force deep_merge_cache key construction if necessary
+          deep_merge_cache.read(*path)
+        end
       end
 
       alias :dig :read
 
       def read!(*path)
-        merged_attributes.read!(*path)
+        if path[0].nil?
+          Chef::Log.warn "Calling node.read!() without any path argument is very slow, probably a bug, and should be avoided"
+          merged_attributes.read!(*path) # re-merges everything, slow edge case
+        else
+          self[path[0]] unless path[0].nil? # force deep_merge_cache key construction if necessary
+          deep_merge_cache.read!(*path)
+        end
       end
 
       def exist?(*path)
-        merged_attributes.exist?(*path)
+        if path[0].nil?
+          true
+        else
+          self[path[0]] unless path[0].nil? # force deep_merge_cache key construction if necessary
+          deep_merge_cache.exist?(*path)
+        end
       end
 
       def write(level, *args, &block)

data/lib/chef/node/mixin/deep_merge_cache.rb

@@ -28,7 +28,7 @@ class Chef
           @merged_attributes = nil
           @combined_override = nil
           @combined_default = nil
-          @deep_merge_cache = {}
+          @deep_merge_cache = Chef::Node::ImmutableMash.new
         end
 
         # Invalidate a key in the deep_merge_cache.  If called with nil, or no arg, this will invalidate
@@ -37,9 +37,9 @@ class Chef
         # must invalidate the entire cache and re-deep-merge the entire node object.
         def reset_cache(path = nil)
           if path.nil?
-            deep_merge_cache.clear
+            deep_merge_cache.regular_clear
           else
-            deep_merge_cache.delete(path.to_s)
+            deep_merge_cache.regular_delete(path.to_s)
           end
         end
 
@@ -51,7 +51,7 @@ class Chef
             deep_merge_cache[key.to_s]
           else
             # save all the work of computing node[key]
-            deep_merge_cache[key.to_s] = merged_attributes(key)
+            deep_merge_cache.internal_set(key.to_s, merged_attributes(key))
           end
         end
 

data/lib/chef/resource/support/client.erb

@@ -13,8 +13,6 @@
       @minimal_ohai
       @named_run_list
       @no_proxy
-      @ohai_disabled_plugins
-      @ohai_optional_plugins
       @pid_file
       @policy_group
       @policy_name

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("16.17.51")
+  VERSION = Chef::VersionString.new("16.18.0")
 end
 
 #

data/spec/functional/resource/chocolatey_package_spec.rb

@@ -41,6 +41,10 @@ describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
     provider
   end
 
+  before(:all) do
+    ENV["Path"] = ENV.delete("Path")
+  end
+
   context "installing a package" do
     after { remove_package }
 

data/spec/unit/client_spec.rb

@@ -310,14 +310,14 @@ describe Chef::Client do
 
   describe "eol release warning" do
     it "warns when running an EOL release" do
-      stub_const("Chef::VERSION", 15)
-      allow(Time).to receive(:now).and_return(Time.new(2021, 5, 1, 5))
-      expect(logger).to receive(:warn).with(/This release of.*became end of life \(EOL\) on May 1st 2021/)
+      stub_const("Chef::VERSION", 16)
+      allow(Time).to receive(:now).and_return(Time.new(2022, 11, 30, 5))
+      expect(logger).to receive(:warn).with("This release of #{ChefUtils::Dist::Infra::PRODUCT} became end of life (EOL) on November 30th 2022. Please update to a supported release to receive new features, bug fixes, and security updates.")
       client.warn_if_eol
     end
 
     it "does not warn when running an non-EOL release" do
-      stub_const("Chef::VERSION", 15)
+      stub_const("Chef::VERSION", 16)
       allow(Time).to receive(:now).and_return(Time.new(2021, 4, 31))
       expect(logger).to_not receive(:warn).with(/became end of life/)
       client.warn_if_eol

data/spec/unit/mixin/powershell_out_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Mixin::PowershellOut, :windows_only do
     it "runs a command and returns the shell_out object" do
       ret = double("Mixlib::ShellOut")
       expect(object).to receive(:shell_out).with(
-        "powershell.exe #{flags} -Command \"Get-Process\""
+        "powershell.exe #{flags} -Command \"Get-Process\"", {}
       ).and_return(ret)
       expect(object.powershell_out("Get-Process")).to eql(ret)
     end
@@ -75,7 +75,7 @@ describe Chef::Mixin::PowershellOut, :windows_only do
     it "runs a command and returns the shell_out object" do
       mixlib_shellout = double("Mixlib::ShellOut")
       expect(object).to receive(:shell_out).with(
-        "powershell.exe #{flags} -Command \"Get-Process\""
+        "powershell.exe #{flags} -Command \"Get-Process\"", {}
       ).and_return(mixlib_shellout)
       expect(mixlib_shellout).to receive(:error!)
       expect(object.powershell_out!("Get-Process")).to eql(mixlib_shellout)

data/spec/unit/resource_spec.rb

@@ -931,14 +931,14 @@ describe Chef::Resource do
 
     it "adds mappings for all platforms", ruby: "< 2.7" do
       expect(Chef.resource_handler_map).to receive(:set).with(
-        :tape_deck, Chef::Resource::Klz, {}
+        :tape_deck, Chef::Resource::Klz
       )
       klz.provides :tape_deck
     end
 
     it "adds mappings for all platforms", ruby: ">= 2.7" do
       expect(Chef.resource_handler_map).to receive(:set).with(
-        :tape_deck, Chef::Resource::Klz
+        :tape_deck, Chef::Resource::Klz, {}
       )
       klz.provides :tape_deck
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 16.17.51
+  version: 16.18.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.17.51
+        version: 16.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.17.51
+        version: 16.18.0
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.17.51
+        version: 16.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 16.17.51
+        version: 16.18.0
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement