chef 18.7.10-universal-mingw-ucrt → 18.8.9-universal-mingw-ucrt

data/spec/unit/provider/package/rpm_spec.rb

@@ -151,7 +151,7 @@ describe Chef::Provider::Package::Rpm do
 
           context "when at the desired version already" do
             it "does nothing when the correct version is installed" do
-              expect(provider).to_not receive(:shell_out_compacted!).with("rpm", "-i", "/tmp/imagemagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", timeout: 900)
+              expect(provider).to_not receive(:shell_out_compacted!).with("rpm", "-i", "/tmp/imagemagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", env: {}, timeout: 900)
 
               provider.action_install
             end
@@ -162,7 +162,7 @@ describe Chef::Provider::Package::Rpm do
             let(:rpm_q_stdout) { "imagemagick-c++ 0.5.4.7-7.el6_5" }
 
             it "runs rpm -u with the package source to upgrade" do
-              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", timeout: 900)
+              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", env: {}, timeout: 900)
               provider.action_install
             end
           end
@@ -177,7 +177,7 @@ describe Chef::Provider::Package::Rpm do
             let(:rpm_q_stdout) { "imagemagick-c++ 21.4-19.el6_5" }
 
             it "should run rpm -u --oldpackage with the package source to downgrade" do
-              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", timeout: 900)
+              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", env: {}, timeout: 900)
               provider.action_install
             end
 
@@ -208,7 +208,7 @@ describe Chef::Provider::Package::Rpm do
             let(:rpm_q_stdout) { "imagemagick-c++ 0.5.4.7-7.el6_5" }
 
             it "runs rpm -u with the package source to upgrade" do
-              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", timeout: 900)
+              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", env: {}, timeout: 900)
               provider.action_upgrade
             end
           end
@@ -224,7 +224,7 @@ describe Chef::Provider::Package::Rpm do
             let(:rpm_q_stdout) { "imagemagick-c++ 21.4-19.el6_5" }
 
             it "should run rpm -u --oldpackage with the package source to downgrade" do
-              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", timeout: 900)
+              expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", env: {}, timeout: 900)
               provider.action_upgrade
             end
 
@@ -368,7 +368,7 @@ describe Chef::Provider::Package::Rpm do
         describe "action install" do
 
           it "installs the package" do
-            expect(provider).to receive(:shell_out_compacted!).with("rpm", "-i", package_source, timeout: 900)
+            expect(provider).to receive(:shell_out_compacted!).with("rpm", "-i", package_source, env: {}, timeout: 900)
 
             provider.action_install
           end
@@ -376,7 +376,7 @@ describe Chef::Provider::Package::Rpm do
           context "when custom resource options are given" do
             it "installs with custom options specified in the resource" do
               new_resource.options("--dbpath /var/lib/rpm")
-              expect(provider).to receive(:shell_out_compacted!).with("rpm", "--dbpath", "/var/lib/rpm", "-i", package_source, timeout: 900)
+              expect(provider).to receive(:shell_out_compacted!).with("rpm", "--dbpath", "/var/lib/rpm", "-i", package_source, env: {}, timeout: 900)
               provider.action_install
             end
           end
@@ -387,7 +387,7 @@ describe Chef::Provider::Package::Rpm do
           let(:action) { :upgrade }
 
           it "installs the package" do
-            expect(provider).to receive(:shell_out_compacted!).with("rpm", "-i", package_source, timeout: 900)
+            expect(provider).to receive(:shell_out_compacted!).with("rpm", "-i", package_source, env: {}, timeout: 900)
 
             provider.action_upgrade
           end
@@ -424,7 +424,7 @@ describe Chef::Provider::Package::Rpm do
     it "should install from a path when the package is a path and the source is nil" do
       expect(new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
       provider.current_resource = current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("rpm", "-i", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", timeout: 900)
+      expect(provider).to receive(:shell_out_compacted!).with("rpm", "-i", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", env: {}, timeout: 900)
       provider.install_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
     end
 
@@ -432,7 +432,7 @@ describe Chef::Provider::Package::Rpm do
       expect(new_resource.source).to eq("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm")
       current_resource.version("21.4-19.el5")
       provider.current_resource = current_resource
-      expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", timeout: 900)
+      expect(provider).to receive(:shell_out_compacted!).with("rpm", "-U", "--oldpackage", "/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", env: {}, timeout: 900)
       provider.upgrade_package("/tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm", "6.5.4.7-7.el6_5")
     end
   end

data/spec/unit/recipe_spec.rb

@@ -630,6 +630,57 @@ describe Chef::Recipe do
     end
   end
 
+  describe "from_json_file" do
+    it "raises IOError if the file does not exist" do
+      filename = "/nonexistent"
+      allow(File).to receive(:file?).and_call_original
+      allow(File).to receive(:file?).with(filename).and_return(false)
+      expect { recipe.from_json_file(filename) }.to raise_error(IOError, /Cannot open or read/)
+    end
+  end
+
+  describe "from_json" do
+    it "raises ArgumentError if the JSON is not a top-level hash" do
+      json = <<~JSON
+        [
+          "one",
+          "resources",
+          "three"
+        ]
+      JSON
+      expect { recipe.from_json(json) }.to raise_error(ArgumentError, /must contain a top-level 'resources' hash/)
+    end
+
+    it "raises ArgumentError if the JSON does not contain a resources hash" do
+      json = <<~JSON
+        {
+          "airplanes": [
+            {
+              "type": "execute",
+              "command": "whoami"
+            }
+          ]
+        }
+      JSON
+      expect { recipe.from_json(json) }.to raise_error(ArgumentError, /must contain a top-level 'resources' hash/)
+    end
+
+    it "does not raise if the JSON contains a resources hash" do
+      json = <<~JSON
+        {
+          "resources": [
+            {
+              "type": "execute",
+              "command": "whoami"
+            }
+          ]
+        }
+      JSON
+      expect(recipe).to receive(:from_hash).with({ "resources" => [{ "command" => "whoami", "type" => "execute" }] })
+      recipe.from_json(json)
+    end
+  end
+
   describe "from_hash" do
     it "declares resources from a hash" do
       resources = { "resources" => [

data/spec/unit/resource/apt_package_spec.rb

@@ -63,4 +63,9 @@ describe Chef::Resource::AptPackage, "initialize" do
     resource.response_file_variables({ variables: true })
     expect(resource.response_file_variables).to eql({ variables: true })
   end
+
+  it "accepts a hash for environment variables" do
+    resource.environment({ variables: true })
+    expect(resource.environment).to eql({ variables: true })
+  end
 end

data/spec/unit/resource/dnf_package_spec.rb

@@ -53,6 +53,12 @@ describe Chef::Resource::DnfPackage, "defaults" do
     expect { resource.action :unlock }.not_to raise_error
     expect { resource.action :upgrade }.not_to raise_error
   end
+
+  it "accepts a hash for environment variables" do
+    resource.environment({ variables: true })
+    expect(resource.environment).to eql({ variables: true })
+  end
+
 end
 
 describe Chef::Resource::DnfPackage, "flush_cache" do

data/spec/unit/resource/ohai_spec.rb

@@ -108,5 +108,78 @@ describe Chef::Resource::Ohai do
       expect(node[:origdata]).to eq("somevalue")
       expect(node[:newdata]).to eq("somevalue")
     end
+
+    it "loads cookbook plugins when the ohai_segment_plugin_path directory exists and has content" do
+      # Setup mock plugin path
+      plugin_path = "/tmp/chef/ohai/cookbook_plugins"
+      Chef::Config[:ohai_segment_plugin_path] = plugin_path
+
+      # Mock that the directory exists and has content
+      allow(Dir).to receive(:exist?).with(plugin_path).and_return(true)
+      allow(Dir).to receive(:empty?).with(plugin_path).and_return(false)
+
+      # Mock the ohai system
+      ohai_mock = double("Ohai::System")
+      config_mock = double("config")
+      plugin_path_array = []
+
+      allow(ohai_mock).to receive(:config).and_return(config_mock)
+      allow(config_mock).to receive(:[]).with(:plugin_path).and_return(plugin_path_array)
+      allow(ohai_mock).to receive(:all_plugins).with(nil)
+      allow(ohai_mock).to receive(:data).and_return({})
+      allow(Ohai::System).to receive(:new).and_return(ohai_mock)
+
+      provider.run_action(:reload)
+
+      # Verify that the plugin path was added to the ohai config
+      expect(plugin_path_array).to include(plugin_path)
+    end
+
+    it "does not attempt to load cookbook plugins when the ohai_segment_plugin_path directory does not exist" do
+      # Setup mock plugin path that doesn't exist
+      plugin_path = "/tmp/chef/ohai/cookbook_plugins"
+      Chef::Config[:ohai_segment_plugin_path] = plugin_path
+
+      # Mock that the directory doesn't exist
+      allow(Dir).to receive(:exist?).with(plugin_path).and_return(false)
+
+      # Mock the ohai system
+      ohai_mock = double("Ohai::System")
+      config_mock = spy("config")
+
+      allow(ohai_mock).to receive(:config).and_return(config_mock)
+      allow(ohai_mock).to receive(:all_plugins).with(nil)
+      allow(ohai_mock).to receive(:data).and_return({})
+      allow(Ohai::System).to receive(:new).and_return(ohai_mock)
+
+      provider.run_action(:reload)
+
+      # Verify that the plugin path configuration was not accessed since directory doesn't exist
+      expect(config_mock).not_to have_received(:[]).with(:additional_plugin_path)
+    end
+
+    it "does not attempt to load cookbook plugins when the ohai_segment_plugin_path directory is empty" do
+      # Setup mock plugin path that exists but is empty
+      plugin_path = "/tmp/chef/ohai/cookbook_plugins"
+      Chef::Config[:ohai_segment_plugin_path] = plugin_path
+
+      # Mock that the directory exists but is empty
+      allow(Dir).to receive(:exist?).with(plugin_path).and_return(true)
+      allow(Dir).to receive(:empty?).with(plugin_path).and_return(true)
+
+      # Mock the ohai system
+      ohai_mock = double("Ohai::System")
+      config_mock = spy("config")
+
+      allow(ohai_mock).to receive(:config).and_return(config_mock)
+      allow(ohai_mock).to receive(:all_plugins).with(nil)
+      allow(ohai_mock).to receive(:data).and_return({})
+      allow(Ohai::System).to receive(:new).and_return(ohai_mock)
+
+      provider.run_action(:reload)
+
+      # Verify that the plugin path configuration was not accessed since directory is empty
+      expect(config_mock).not_to have_received(:[]).with(:additional_plugin_path)
+    end
   end
 end

data/spec/unit/resource/yum_package_spec.rb

@@ -148,3 +148,12 @@ describe Chef::Resource::YumPackage, "yum_binary" do
     expect(resource.yum_binary).to eql("/usr/bin/yum-something")
   end
 end
+
+describe Chef::Resource::YumPackage, "environment" do
+  let(:resource) { Chef::Resource::YumPackage.new("foo") }
+
+  it "should allow you to specify the environment" do
+    resource.environment({ variables: true })
+    expect(resource.environment).to eql({ variables: true })
+  end
+end

data/spec/unit/resource_reporter_spec.rb

@@ -507,65 +507,7 @@ describe Chef::ResourceReporter do
       it_should_behave_like "a successful client run"
     end
 
-    context "windows registry_key resource" do
-      let(:current_resource) do
-        resource = Chef::Resource::RegistryKey.new('HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager')
-        resource.values([{ name: "PendingFileRenameOperations", type: :multi_string, data: 10000.times.map { |n| "C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\Temp\\2\\Chef-20140107123456-1234-#{n}" } } ])
-        resource
-      end
-
-      let(:new_resource) do
-        resource = Chef::Resource::RegistryKey.new('HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager')
-        resource.values([ { name: "ProtectionMode", type: :dword, data: 1 } ])
-        allow(resource).to receive(:cookbook_name).and_return(cookbook_name)
-        allow(resource).to receive(:cookbook_version).and_return(cookbook_version)
-        resource
-      end
-
-      it "should raise an error when the data is too large" do
-        pending "Need to test truncation properly"
-        # Start the run
-        resource_reporter.run_started(run_status)
-        run_status.start_clock
-
-        # These 4 event callbacks are essential to populate resource state:
-        events.resource_action_start(new_resource, :create)
-        events.resource_current_state_loaded(new_resource, :create, current_resource)
-        events.resource_updated(new_resource, :create)
-        events.resource_completed(new_resource)
-
-        # Stop the run
-        run_status.stop_clock
-
-        # Prepare the run data - this will include the resource states
-        report_data = resource_reporter.prepare_run_data
-
-        # Verify the report includes our resource
-        expect(report_data["resources"].length).to eq(1)
-        expect(report_data["resources"][0]["before"]).to eq(current_resource.state_for_resource_reporter)
-        expect(report_data["resources"][0]["after"]).to eq(new_resource.state_for_resource_reporter)
-
-        expect(rest_client).to receive(:post) do |path, data, headers|
-          expect(path).to eq("reports/nodes/spitfire/runs")
-          raise Chef::Exceptions::ValidationFailed, "data too large" if data.length > 10000
-        end
-
-        # Now mock the actual post request to fail due to size
-        expect(rest_client).to receive(:raw_request) do |method, url, headers, data|
-          data_stream = Zlib::GzipReader.new(StringIO.new(data))
-          data = data_stream.read
-          expect(data).to include('"before":')  # Verify current_resource state is included
-          expect(data).to include('"after":')   # Verify new_resource state is included
-          raise Chef::Exceptions::ValidationFailed, "data too large"
-        end
-
-        # Assert that the post fails due to validation
-        expect { resource_reporter.run_completed(node) }.to raise_error(Chef::Exceptions::ValidationFailed)
-      end
-    end
-
     context "for an unsuccessful run" do
-
       before do
         @backtrace = ["foo.rb:1 in `foo!'", "bar.rb:2 in `bar!", "'baz.rb:3 in `baz!'"]
         node = Chef::Node.new

data/spec/unit/shell_spec.rb

@@ -65,11 +65,17 @@ describe Shell do
       conf.main = Object.new
       conf.main.instance_eval(&object_test_harness)
       Shell.irb_conf[:IRB_RC].call(conf)
-      expect(conf.prompt_c).to      eq("chef > ")
+      if RUBY_VERSION >= "3.3.0"
+        expect(conf.prompt_c).to      eq("chef > ")
+        expect(conf.prompt_n).to      eq("chef ?> ")
+        expect(conf.prompt_s).to      eq("chef%l> ")
+      else
+        expect(conf.prompt_c).to      eq("chef (#{Chef::VERSION})> ")
+        expect(conf.prompt_n).to      eq("chef(#{Chef::VERSION})?> ")
+        expect(conf.prompt_s).to      eq("chef(#{Chef::VERSION})%l> ")
+      end
       expect(conf.return_format).to eq(" => %s \n")
       expect(conf.prompt_i).to      eq("chef (#{Chef::VERSION})> ")
-      expect(conf.prompt_n).to      eq("chef ?> ")
-      expect(conf.prompt_s).to      eq("chef%l> ")
       expect(conf.use_tracer).to    eq(false)
     end
 
@@ -80,10 +86,17 @@ describe Shell do
       events = Chef::EventDispatch::Dispatcher.new
       conf.main = Chef::Recipe.new(nil, nil, Chef::RunContext.new(Chef::Node.new, {}, events))
       Shell.irb_conf[:IRB_RC].call(conf)
-      expect(conf.prompt_c).to      eq("chef:recipe > ")
-      expect(conf.prompt_i).to      eq("chef:recipe (#{Chef::VERSION})> ")
-      expect(conf.prompt_n).to      eq("chef:recipe ?> ")
-      expect(conf.prompt_s).to      eq("chef:recipe%l> ")
+      if RUBY_VERSION >= "3.3.0"
+        expect(conf.prompt_c).to eq("chef:recipe > ")
+        expect(conf.prompt_n).to eq("chef:recipe ?> ")
+        expect(conf.prompt_s).to eq("chef:recipe%l> ")
+      else
+        expect(conf.prompt_c).to eq("chef:recipe (#{Chef::VERSION})> ")
+        expect(conf.prompt_n).to eq("chef:recipe(#{Chef::VERSION})?> ")
+        expect(conf.prompt_s).to eq("chef:recipe(#{Chef::VERSION})%l> ")
+      end
+
+      expect(conf.prompt_i).to eq("chef:recipe (#{Chef::VERSION})> ")
     end
 
     it "has a prompt like ``chef:attributes > '' in attributes/node context" do
@@ -92,10 +105,17 @@ describe Shell do
       conf = OpenStruct.new
       conf.main = Chef::Node.new
       Shell.irb_conf[:IRB_RC].call(conf)
-      expect(conf.prompt_c).to      eq("chef:attributes > ")
-      expect(conf.prompt_i).to      eq("chef:attributes (#{Chef::VERSION})> ")
-      expect(conf.prompt_n).to      eq("chef:attributes ?> ")
-      expect(conf.prompt_s).to      eq("chef:attributes%l> ")
+
+      if RUBY_VERSION >= "3.3.0"
+        expect(conf.prompt_c).to eq("chef:attributes > ")
+        expect(conf.prompt_n).to eq("chef:attributes ?> ")
+        expect(conf.prompt_s).to eq("chef:attributes%l> ")
+      else
+        expect(conf.prompt_c).to eq("chef:attributes (#{Chef::VERSION})> ")
+        expect(conf.prompt_n).to eq("chef:attributes(#{Chef::VERSION})?> ")
+        expect(conf.prompt_s).to eq("chef:attributes(#{Chef::VERSION})%l> ")
+      end
+      expect(conf.prompt_i).to eq("chef:attributes (#{Chef::VERSION})> ")
     end
 
   end

data/tasks/rspec.rb

@@ -67,7 +67,7 @@ begin
     desc "Run chef's node and role unit specs with activesupport loaded"
     RSpec::Core::RakeTask.new(:activesupport) do |t|
       t.verbose = false
-      t.rspec_opts = %w{--require active_support/core_ext --profile}
+      t.rspec_opts = %w{--profile}
       # Only node_spec and role_spec specifically have issues, target those tests
       t.pattern = FileList["spec/unit/node_spec.rb", "spec/unit/role_spec.rb"]
     end

metadata

@@ -1,43 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.7.10
+  version: 18.8.9
 platform: universal-mingw-ucrt
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-16 00:00:00.000000000 Z
+date: 2025-08-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.7.1
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 7.1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.7.1
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 7.1.3.2
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.7.10
+        version: 18.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.7.10
+        version: 18.8.9
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.7.10
+        version: 18.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.7.10
+        version: 18.8.9
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -374,14 +394,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 15.0.17
+        version: 15.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 15.0.17
+        version: 15.0.21
 - !ruby/object:Gem::Dependency
   name: chef-vault
   requirement: !ruby/object:Gem::Requirement
@@ -486,6 +506,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.8.2
+- !ruby/object:Gem::Dependency
+  name: uri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: corefoundation
   requirement: !ruby/object:Gem::Requirement