chef 18.6.2 → 18.7.3

data/spec/tiny_server.rb

@@ -19,6 +19,7 @@
 require "webrick"
 require "webrick/https"
 require "rack"
+require "rackup"
 require "singleton"
 require "open-uri"
 require "chef/config"
@@ -91,7 +92,7 @@ module TinyServer
 
     def create_server(**extra_options)
       server = WEBrick::HTTPServer.new(**options, **extra_options)
-      server.mount("/", Rack::Handler::WEBrick, API.instance)
+      server.mount("/", Rackup::Handler::WEBrick, API.instance)
       server
     end
   end
@@ -172,7 +173,9 @@ module TinyServer
 
     def initialize(response_code = 200, data = nil, headers = nil, &block)
       @response_code, @data = response_code, data
-      @response_headers = headers ? HEADERS.merge(headers) : HEADERS
+      # .merge creates a new hash, headers is sometimes passed as nil, @response_headers gets mutated somewhere
+      # in processing
+      @response_headers = HEADERS.merge(headers || {})
       @block = block_given? ? block : nil
     end
 

data/spec/unit/provider/apt_repository_spec.rb

@@ -246,43 +246,48 @@ C5986B4F1257FFA86632CBA746181433FBB75451
   describe "#build_repo" do
     it "creates a repository string" do
       target = "deb      http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, nil, [])).to eql(target)
     end
 
     it "creates a repository string with spaces" do
       target = "deb      http://test/uri%20with%20spaces unstable main\n"
-      expect(provider.build_repo("http://test/uri with spaces", "unstable", "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri with spaces", "unstable", "main", false, nil, nil, [])).to eql(target)
     end
 
     it "creates a repository string with no distribution" do
       target = "deb      http://test/uri main\n"
-      expect(provider.build_repo("http://test/uri", nil, "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri", nil, "main", false, nil, nil, [])).to eql(target)
     end
 
     it "creates a repository string with source" do
       target = "deb      http://test/uri unstable main\ndeb-src  http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, [], true)).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, nil, [], true)).to eql(target)
     end
 
     it "creates a repository string with trusted" do
       target = "deb      [trusted=yes] http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", true, nil, [])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", true, nil, nil, [])).to eql(target)
+    end
+
+    it "creates a repository string with signed-by" do
+      target = "deb      [signed-by=/etc/apt/keyrings/test.gpg] http://test/uri unstable main\n"
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, "/etc/apt/keyrings/test.gpg", [])).to eql(target)
     end
 
     it "creates a repository string with custom options" do
       target = "deb      [by-hash=no] http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, ["by-hash=no"])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, nil, ["by-hash=no"])).to eql(target)
     end
 
     it "creates a repository string with trusted, arch, and custom options" do
       target = "deb      [arch=amd64 trusted=yes by-hash=no] http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", true, "amd64", ["by-hash=no"])).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", true, "amd64", nil, ["by-hash=no"])).to eql(target)
     end
 
     it "handles a ppa repo" do
       target = "deb      http://ppa.launchpad.net/chef/main/ubuntu unstable main\n"
       expect(provider).to receive(:make_ppa_url).with("ppa:chef/main").and_return("http://ppa.launchpad.net/chef/main/ubuntu")
-      expect(provider.build_repo("ppa:chef/main", "unstable", "main", false, nil, [])).to eql(target)
+      expect(provider.build_repo("ppa:chef/main", "unstable", "main", false, nil, nil, [])).to eql(target)
     end
   end
 end

data/spec/unit/provider/registry_key_spec.rb

@@ -26,7 +26,8 @@ shared_examples_for "a registry key" do
     describe "when the key exists" do
       before(:each) do
         expect(@double_registry).to receive(:key_exists?).with(keyname).and_return(true)
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
+        @new_resource.only_record_changes false
         @provider.load_current_resource
       end
 
@@ -66,7 +67,7 @@ shared_examples_for "a registry key" do
       end
       it "should do nothing if the if a case insensitive key and the value both exist" do
         @provider.new_resource.key(keyname.downcase)
-        expect(@double_registry).to receive(:get_values).with(keyname.downcase).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname.downcase).and_return( [testval1 ])
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create
@@ -77,25 +78,25 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "should do nothing if the key and the value both exist" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create
       end
       it "should create the value if the key exists but the value does not" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create
       end
       it "should set the value if the key exists but the data does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_data )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_data] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create
       end
       it "should set the value if the key exists but the type does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_type )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_type] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create
@@ -105,7 +106,7 @@ shared_examples_for "a registry key" do
       it "when a value is in the key, it should do nothing" do
         @provider.new_resource.values([])
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).not_to receive(:create_key)
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
@@ -150,25 +151,25 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "should do nothing if the key and the value both exist" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create_if_missing
       end
       it "should create the value if the key exists but the value does not" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
         expect(@double_registry).to receive(:set_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_create_if_missing
       end
       it "should not set the value if the key exists but the data does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_data )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_data] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create_if_missing
       end
       it "should not set the value if the key exists but the type does not match" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_type )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_type] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create_if_missing
@@ -193,25 +194,25 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "deletes the value when the value exists" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).to receive(:delete_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_delete
       end
       it "deletes the value when the value exists, but the type is wrong" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_type )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_type] )
         expect(@double_registry).to receive(:delete_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_delete
       end
       it "deletes the value when the value exists, but the data is wrong" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1_wrong_data )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1_wrong_data] )
         expect(@double_registry).to receive(:delete_value).with(keyname, testval1)
         @provider.load_current_resource
         @provider.action_delete
       end
       it "does not delete the value when the value does not exist" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval2 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval2] )
         expect(@double_registry).not_to receive(:delete_value)
         @provider.load_current_resource
         @provider.action_delete
@@ -235,7 +236,7 @@ shared_examples_for "a registry key" do
         expect(@double_registry).to receive(:key_exists?).twice.with(keyname).and_return(true)
       end
       it "deletes the key" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( testval1 )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [testval1] )
         expect(@double_registry).to receive(:delete_key).with(keyname, false)
         @provider.load_current_resource
         @provider.action_delete_key
@@ -303,7 +304,7 @@ describe Chef::Provider::RegistryKey do
       end
 
       it "does not make a change for datatype of data value differing" do
-        expect(@double_registry).to receive(:get_values).with(keyname).and_return( dword_passed_as_integer )
+        expect(@double_registry).to receive(:get_values).with(keyname).and_return( [dword_passed_as_integer] )
         expect(@double_registry).not_to receive(:set_value)
         @provider.load_current_resource
         @provider.action_create

data/spec/unit/util/powershell/ps_credential_spec.rb

@@ -35,6 +35,12 @@ describe Chef::Util::Powershell::PSCredential do
       end
     end
 
+    context "when inspect is called" do
+      it "should not contain the password" do
+        expect(ps_credential.inspect).not_to match(/#{password}/)
+      end
+    end
+
     context "when to_text is called" do
       it "should not contain the password" do
         allow(ps_credential).to receive(:encrypt).with(password).and_return("encrypted")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.6.2
+  version: 18.7.3
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-03-31 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.6.2
+        version: 18.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.6.2
+        version: 18.7.3
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.6.2
+        version: 18.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.6.2
+        version: 18.7.3
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +62,16 @@ dependencies:
   name: train-winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.17
 - !ruby/object:Gem::Dependency
   name: train-rest
   requirement: !ruby/object:Gem::Requirement
@@ -133,9 +133,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.3
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -143,9 +143,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.3
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: mixlib-authentication
   requirement: !ruby/object:Gem::Requirement
@@ -374,14 +374,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 14.0.11
+        version: 15.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 14.0.11
+        version: 15.0.17
 - !ruby/object:Gem::Dependency
   name: chef-vault
   requirement: !ruby/object:Gem::Requirement
@@ -1745,12 +1745,12 @@ files:
 - spec/functional/assets/mytest-1.0-1.noarch.rpm
 - spec/functional/assets/mytest-2.0-1.noarch.rpm
 - spec/functional/assets/testchefsubsys
-- spec/functional/assets/yumrepo-empty/repodata/01a3b489a465bcac22a43492163df43451dc6ce47d27f66de289756b91635523-filelists.sqlite.bz2
-- spec/functional/assets/yumrepo-empty/repodata/401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93-filelists.xml.gz
-- spec/functional/assets/yumrepo-empty/repodata/5dc1e6e73c84803f059bb3065e684e56adfc289a7e398946574d79dac6643945-primary.sqlite.bz2
-- spec/functional/assets/yumrepo-empty/repodata/6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670-other.xml.gz
-- spec/functional/assets/yumrepo-empty/repodata/7c36572015e075add2b38b900837bcdbb8a504130ddff49b2351a7fc0affa3d4-other.sqlite.bz2
-- spec/functional/assets/yumrepo-empty/repodata/dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9-primary.xml.gz
+- spec/functional/assets/yumrepo-empty/repodata/01a3b-filelists.sqlite.bz2
+- spec/functional/assets/yumrepo-empty/repodata/401dc-filelists.xml.gz
+- spec/functional/assets/yumrepo-empty/repodata/5dc1e-primary.sqlite.bz2
+- spec/functional/assets/yumrepo-empty/repodata/6bf96-other.xml.gz
+- spec/functional/assets/yumrepo-empty/repodata/7c365-other.sqlite.bz2
+- spec/functional/assets/yumrepo-empty/repodata/dabe2-primary.xml.gz
 - spec/functional/assets/yumrepo-empty/repodata/repomd.xml
 - spec/functional/assets/yumrepo/chef_rpm-1.10-1.aarch64.rpm
 - spec/functional/assets/yumrepo/chef_rpm-1.10-1.i686.rpm