chef 18.2.7 → 18.3.0

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

@@ -49,6 +49,10 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-l", "-r", { returns: [0, 2], timeout: timeout }).and_return(local_list_obj)
   end
 
+  after(:each) do
+    described_class.instance_variable_set(:@get_choco_version, nil)
+  end
+
   def allow_remote_list(package_names, args = nil)
     remote_list_stdout = <<~EOF
       Chocolatey v0.9.9.11
@@ -61,9 +65,9 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     remote_list_obj = double(stdout: remote_list_stdout)
     package_names.each do |pkg|
       if args
-        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-r", pkg, *args, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
+        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, described_class.query_command, "-r", pkg, *args, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
       else
-        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-r", pkg, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
+        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, described_class.query_command, "-r", pkg, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
       end
     end
   end
@@ -78,6 +82,18 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     end
   end
 
+  describe "choco searches change with the version" do
+    it "Choco V1 uses List" do
+      allow(described_class).to receive(:get_choco_version).and_return("1.4.0")
+      expect(provider.query_command).to eql("list")
+    end
+
+    it "Choco V2 uses Search" do
+      allow(described_class).to receive(:get_choco_version).and_return("2.1.0")
+      expect(provider.query_command).to eql("search")
+    end
+  end
+
   describe "#candidate_version" do
     it "should set the candidate_version to the latest version when not pinning" do
       allow_remote_list(["git"])
@@ -150,7 +166,7 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       new_resource.package_name("package-does-not-exist")
       new_resource.returns([0])
       allow(provider).to receive(:shell_out_compacted!)
-        .with(choco_exe, "list", "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
+        .with(choco_exe, described_class.query_command, "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
         .and_raise(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
       expect { provider.send(:available_packages) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
     end

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

@@ -41,7 +41,7 @@ describe Chef::Provider::Package::Rpm do
   let(:rpm_q_status) { instance_double("Mixlib::ShellOut", exitstatus: rpm_q_exitstatus, stdout: rpm_q_stdout) }
 
   before(:each) do
-    allow(::File).to receive(:exist?).with("PLEASE STUB File.exists? EXACTLY").and_return(true)
+    allow(::File).to receive(:exist?).with("PLEASE STUB File.exist? EXACTLY").and_return(true)
 
     # Ensure all shell out usage is stubbed with exact arguments
     allow(provider).to receive(:shell_out_compacted!).with("PLEASE STUB YOUR SHELLOUT CALLS").and_return(nil)
@@ -412,7 +412,7 @@ describe Chef::Provider::Package::Rpm do
 
     let(:new_resource) do
       # When we pass a source in as the name, then #initialize in the
-      # provider will call File.exists?. Because of the ordering in our
+      # provider will call File.exist?. Because of the ordering in our
       # let() bindings and such, we have to set the stub here and not in a
       # before block.
       allow(::File).to receive(:exist?).with(package_source).and_return(true)

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

@@ -491,4 +491,14 @@ describe Chef::Provider::Package::Zypper do
       provider.remove_package(%w{emacs vim}, ["1.0", "2.0"])
     end
   end
+
+  describe "resolve_available_version" do
+    it "should return correct version if multiple packages are shown" do
+      status = double(stdout: "S  | Name                     | Type    | Version             | Arch   | Repository\n---+--------------------------+---------+---------------------+--------+-------------------------------------------------------------\n   | apache2-mod_wsgi         | package | 4.7.1-150400.3.3.1  | x86_64 | Update repository with updates from SUSE Linux Enterprise 15\n   | apache2-mod_wsgi         | package | 4.7.1-150400.1.52   | x86_64 | Main Repository\ni+ | apache2-mod_wsgi-python3 | package | 4.5.18-150000.4.6.1 | x86_64 | Update repository with updates from SUSE Linux Enterprise 15\nv  | apache2-mod_wsgi-python3 | package | 4.5.18-4.3.1        | x86_64 | Main Repository\n", exitstatus: 0)
+
+      allow(provider).to receive(:shell_out_compacted!).and_return(status)
+      result = provider.send(:resolve_available_version, "apache2-mod_wsgi-python3", nil)
+      expect(result).to eq("4.5.18-150000.4.6.1")
+    end
+  end
 end

data/spec/unit/provider/remote_file/http_spec.rb

@@ -251,7 +251,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       end
 
       context "and the response has no Date or Last-Modified header" do
-        let(:last_response) { { "date" => nil, "last_modified" => nil } }
+        let(:last_response) { { "date" => nil, "last-modified" => nil } }
         it "does not set an mtime in the result" do
           # RFC 2616 suggests that servers that do not set a Date header do not
           # have a reliable clock, so no use in making them deal with dates.
@@ -265,19 +265,19 @@ describe Chef::Provider::RemoteFile::HTTP do
       context "and the response has a Last-Modified header" do
         let(:last_response) do
           # Last-Modified should be preferred to Date if both are set
-          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => "Fri, 17 May 2013 11:11:11 GMT" }
+          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last-modified" => "Fri, 17 May 2013 11:11:11 GMT" }
         end
 
         it "sets the mtime to the Last-Modified time in the response" do
           fetcher.fetch
           expect(cache_control_data.etag).to be_nil
-          expect(cache_control_data.mtime).to eq(last_response["last_modified"])
+          expect(cache_control_data.mtime).to eq(last_response["last-modified"])
         end
       end
 
       context "and the response has a Date header but no Last-Modified header" do
         let(:last_response) do
-          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => nil }
+          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last-modified" => nil }
         end
 
         it "sets the mtime to the Date in the response" do

data/spec/unit/resource/apt_repository_spec.rb

@@ -68,6 +68,11 @@ describe Chef::Resource::AptRepository do
     expect(resource.key).to eql(["key1"])
   end
 
+  it "allows setting options to a String and coerces it to an Array" do
+    resource.options = "by-hash=no"
+    expect(resource.options).to eql(["by-hash=no"])
+  end
+
   it "fails if the user provides a repo_name with a forward slash" do
     expect { resource.repo_name "foo/bar" }.to raise_error(ArgumentError)
   end

data/spec/unit/resource_spec.rb

@@ -803,6 +803,92 @@ describe Chef::Resource do
     end
   end
 
+  describe "when using resource partials" do
+    let(:resource_using_core_partial) do
+      Class.new(Chef::Resource) do
+        use "core::core_partial"
+      end
+    end
+
+    let(:resource_using_cookbook_partial) do
+      Class.new(Chef::Resource) do
+        use "my_local_partial"
+      end
+    end
+
+    let(:resource_using_nested_partials) do
+      FakeCaller = Struct.new(:label, :path, keyword_init: true)
+      NonDynamicResource = Chef::Resource.dup
+
+      # Fake a caller_locations array, as RSpec uses a different execution path
+      NonDynamicResource.define_singleton_method(:caller_locations) do
+        [
+          FakeCaller.new(label: "use", path: File.join(__dir__, "resource.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level3_partial.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level2_partial.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level1_partial.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level0_partial.rb")),
+        ]
+      end
+
+      Class.new(NonDynamicResource) do
+        use "level3_partial"
+      end
+    end
+
+    it "correcly includes a core partial" do
+      expected_path = File.expand_path(File.join(__dir__, "../..", "lib/chef", "resource/_core_partial.rb"))
+      partial = "property :addon_property, default: true"
+
+      expect(IO).to receive(:read).with(expected_path).and_return(partial)
+      expect(resource_using_core_partial.properties.keys).to include(:addon_property)
+    end
+
+    it "correctly includes a cookbook partial" do
+      expected_path = File.expand_path(File.join(__dir__, "_my_local_partial.rb"))
+      partial = "property :addon_property, default: true"
+
+      expect(IO).to receive(:read).with(expected_path).and_return(partial)
+      expect(resource_using_cookbook_partial.properties.keys).to include(:addon_property)
+    end
+
+    it "correctly includes nested partials" do
+      level0_path = File.expand_path(File.join(__dir__, "_level0_partial.rb"))
+      level0_partial = "property :level0_property, default: true"
+      expect(IO).to receive(:read).with(level0_path).and_return(level0_partial)
+
+      level1_path = File.expand_path(File.join(__dir__, "_level1_partial.rb"))
+      level1_partial = <<-EOF
+        use 'level0_partial'
+        property :level1_property, default: true
+      EOF
+      expect(IO).to receive(:read).with(level1_path).and_return(level1_partial)
+
+      level2_path = File.expand_path(File.join(__dir__, "_level2_partial.rb"))
+      level2_partial = <<-EOF
+        use 'level1_partial'
+        property :level2_property, default: true
+      EOF
+      expect(IO).to receive(:read).with(level2_path).and_return(level2_partial)
+
+      level3_path = File.expand_path(File.join(__dir__, "_level3_partial.rb"))
+      level3_partial = <<-EOF
+        use 'level2_partial'
+        property :level3_property, default: true
+      EOF
+      expect(IO).to receive(:read).with(level3_path).and_return(level3_partial)
+
+      expect(resource_using_nested_partials.properties.keys).to include(:level0_property)
+      expect(resource_using_nested_partials.properties.keys).to include(:level1_property)
+      expect(resource_using_nested_partials.properties.keys).to include(:level2_property)
+      expect(resource_using_nested_partials.properties.keys).to include(:level3_property)
+    end
+  end
+
   describe "should_skip?" do
     before do
       resource = Chef::Resource::Cat.new("sugar", run_context)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.2.7
+  version: 18.3.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-04 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.2.7
+        version: 18.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.2.7
+        version: 18.3.0
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.2.7
+        version: 18.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.2.7
+        version: 18.3.0
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -857,6 +857,7 @@ files:
 - lib/chef/mixin/windows_env_helper.rb
 - lib/chef/mixin/xml_escape.rb
 - lib/chef/mixins.rb
+- lib/chef/monkey_patches/net-http.rb
 - lib/chef/monkey_patches/webrick-utils.rb
 - lib/chef/monkey_patches/win32/registry.rb
 - lib/chef/monologger.rb
@@ -1713,10 +1714,10 @@ files:
 - spec/functional/assets/PkgA.1.0.0.0.bff
 - spec/functional/assets/PkgA.2.0.0.0.bff
 - spec/functional/assets/chefinittest
-- spec/functional/assets/chocolatey_feed/test-A.1.0.nupkg
-- spec/functional/assets/chocolatey_feed/test-A.1.5.nupkg
-- spec/functional/assets/chocolatey_feed/test-A.2.0.nupkg
-- spec/functional/assets/chocolatey_feed/test-B.1.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-A.1.0.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-A.1.5.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-A.2.0.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-B.1.0.0.nupkg
 - spec/functional/assets/dummy-1-0.aix6.1.noarch.rpm
 - spec/functional/assets/dummy-2-0.aix6.1.noarch.rpm
 - spec/functional/assets/inittest