chef 16.4.41-universal-mingw32 → 16.8.9-universal-mingw32

data/spec/unit/knife/ssh_spec.rb

@@ -283,10 +283,10 @@ describe Chef::Knife::Ssh do
   end
 
   describe "#ssh_command" do
-    let(:execution_channel) { double(:execution_channel, on_data: nil) }
+    let(:execution_channel) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
     let(:session_channel) { double(:session_channel, request_pty: nil) }
 
-    let(:execution_channel2) { double(:execution_channel, on_data: nil) }
+    let(:execution_channel2) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
     let(:session_channel2) { double(:session_channel, request_pty: nil) }
 
     let(:session) { double(:session, loop: nil) }

data/spec/unit/knife/supermarket_download_spec.rb

@@ -86,8 +86,8 @@ describe Chef::Knife::SupermarketDownload do
               .with(/.+deprecated.+replaced by other_apache2.+/i)
             expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
             @knife.run
-            expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+            expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+            expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
           end
 
         end
@@ -95,8 +95,8 @@ describe Chef::Knife::SupermarketDownload do
         it "should download the latest version" do
           expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+          expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+          expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
         end
 
         context "with -f or --file" do
@@ -108,8 +108,8 @@ describe Chef::Knife::SupermarketDownload do
 
           it "should download the cookbook to the desired file" do
             @knife.run
-            expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-            expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+            expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+            expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
           end
         end
 
@@ -140,8 +140,8 @@ describe Chef::Knife::SupermarketDownload do
             .and_return(@temp_file)
           expect(FileUtils).to receive(:cp).with(@temp_file.path, @file)
           @knife.run
-          expect(@stderr.string).to match /downloading apache2.+version.+#{Regexp.escape(@version)}/i
-          expect(@stderr.string).to match /cookbook save.+#{Regexp.escape(@file)}/i
+          expect(@stderr.string).to match(/downloading apache2.+version.+#{Regexp.escape(@version)}/i)
+          expect(@stderr.string).to match(/cookbook save.+#{Regexp.escape(@file)}/i)
         end
       end
 

data/spec/unit/knife/supermarket_list_spec.rb

@@ -52,7 +52,7 @@ describe Chef::Knife::SupermarketList do
     it "should display all supermarket cookbooks" do
       knife.run
       cookbooks_data.each do |item|
-        expect(stdout.string).to match /#{item["cookbook_name"]}\s/
+        expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
       end
     end
 
@@ -61,8 +61,8 @@ describe Chef::Knife::SupermarketList do
         knife.config[:with_uri] = true
         knife.run
         cookbooks_data.each do |item|
-          expect(stdout.string).to match /#{item["cookbook_name"]}\s/
-          expect(stdout.string).to match /#{item["cookbook"]}\s/
+          expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
+          expect(stdout.string).to match(/#{item["cookbook"]}\s/)
         end
       end
     end

data/spec/unit/knife/supermarket_search_spec.rb

@@ -65,7 +65,7 @@ describe Chef::Knife::SupermarketSearch do
         knife.name_args = ["mysql"]
         knife.run
         cookbooks_data.each do |item|
-          expect(stdout.string).to match /#{item["cookbook_name"]}\s/
+          expect(stdout.string).to match(/#{item["cookbook_name"]}\s/)
         end
       end
     end

data/spec/unit/knife/tag_create_spec.rb

@@ -17,7 +17,7 @@ describe Chef::Knife::TagCreate do
     it "can create tags on a node" do
       @knife.run
       expect(@node.tags).to eq(["happytag"])
-      expect(@stderr.string).to match /created tags happytag.+node webmonkey.example.com/i
+      expect(@stderr.string).to match(/created tags happytag.+node webmonkey.example.com/i)
     end
   end
 end

data/spec/unit/knife/tag_delete_spec.rb

@@ -19,7 +19,7 @@ describe Chef::Knife::TagDelete do
       expect(@node.tags).to eq(%w{sadtag happytag})
       @knife.run
       expect(@node.tags).to eq(["happytag"])
-      expect(@stderr.string).to match /deleted.+sadtag/i
+      expect(@stderr.string).to match(/deleted.+sadtag/i)
     end
   end
 end

data/spec/unit/knife/user_create_spec.rb

@@ -112,7 +112,7 @@ describe Chef::Knife::UserCreate do
 
       it "prints a relevant error message" do
         expect { knife.run }.to raise_error(SystemExit)
-        expect(stderr.string).to match /You cannot pass --user-key and --prevent-keygen/
+        expect(stderr.string).to match(/You cannot pass --user-key and --prevent-keygen/)
       end
     end
 

data/spec/unit/lwrp_spec.rb

@@ -169,7 +169,7 @@ describe "LWRP" do
   describe "Lightweight Chef::Resource" do
 
     before do
-      Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources", "*"))].each do |file|
+      Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources", "*"))].each do |file|
         Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
       end
     end
@@ -211,7 +211,7 @@ describe "LWRP" do
       node.normal[:penguin_name] = "jackass"
       run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new, @events)
 
-      Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
+      Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
         Chef::Resource::LWRPBase.build_from_file("lwrp", file, run_context)
       end
 
@@ -654,7 +654,7 @@ describe "LWRP" do
     end
 
     let(:run_context) do
-      cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
+      cookbook_repo = File.expand_path(File.join(__dir__, "..", "data", "cookbooks"))
       cookbook_loader = Chef::CookbookLoader.new(cookbook_repo)
       cookbook_loader.load_cookbooks
       cookbook_collection = Chef::CookbookCollection.new(cookbook_loader)

data/spec/unit/mixin/deep_merge_spec.rb

@@ -236,6 +236,14 @@ describe Chef::Mixin::DeepMerge, "deep_merge!" do
     @dm.deep_merge!(hash_src, hash_dst)
     expect(hash_dst).to eq({ "item" => "orange" })
   end
+
+  it "should overwrite a string with a nil when merging nil values" do
+    hash_src = { "item" => nil }
+    hash_dst = { "item" => "orange" }
+    @dm.deep_merge!(hash_src, hash_dst)
+    expect(hash_dst).to eq({ "item" => nil })
+  end
+
 end # deep_merge!
 
 # Chef specific
@@ -338,5 +346,12 @@ describe Chef::Mixin::DeepMerge do
       merge_with_hash = { "top_level_a" => 2, "top_level_b" => true }
       @dm.hash_only_merge(merge_ee_hash, merge_with_hash)
     end
+
+    it "should overwrite a string with a nil when merging nil values" do
+      hash_src = { "item" => nil }
+      hash_dst = { "item" => "orange" }
+      merged_result = @dm.hash_only_merge(hash_dst, hash_src)
+      expect(merged_result).to eq({ "item" => nil })
+    end
   end
 end

data/spec/unit/mixin/openssl_helper_spec.rb

@@ -99,7 +99,7 @@ describe Chef::Mixin::OpenSSLHelper do
 
     context "When the dhparam.pem file does exist, and does contain a vaild dhparam key" do
       it "returns true" do
-        @dhparam_file.puts(::OpenSSL::PKey::DH.new(1024).to_pem)
+        @dhparam_file.puts(::OpenSSL::PKey::DH.new(256).to_pem) # this is 256 to speed up specs
         @dhparam_file.close
         expect(instance.dhparam_pem_valid?(@dhparam_file.path)).to be_truthy
       end

data/spec/unit/mixin/powershell_exec_spec.rb

@@ -24,8 +24,37 @@ describe Chef::Mixin::PowershellExec, :windows_only do
   subject(:object) { powershell_mixin.new }
 
   describe "#powershell_exec" do
-    it "runs a basic command and returns a Chef::PowerShell object" do
-      expect(object.powershell_exec("$PSVersionTable")).to be_kind_of(Chef::PowerShell)
+    context "not specifying an interpreter" do
+      it "runs a basic command and returns a Chef::PowerShell object" do
+        expect(object.powershell_exec("$PSVersionTable")).to be_kind_of(Chef::PowerShell)
+      end
+
+      it "uses less than version 6" do
+        execution = object.powershell_exec("$PSVersionTable")
+        expect(execution.result["PSVersion"].to_s.to_i).to be < 6
+      end
+    end
+
+    context "using pwsh interpreter" do
+      it "runs a basic command and returns a Chef::PowerShell object" do
+        expect(object.powershell_exec("$PSVersionTable", :pwsh)).to be_kind_of(Chef::Pwsh)
+      end
+
+      it "uses greater than version 6" do
+        execution = object.powershell_exec("$PSVersionTable", :pwsh)
+        expect(execution.result["PSVersion"]["Major"]).to be > 6
+      end
+    end
+
+    context "using powershell interpreter" do
+      it "runs a basic command and returns a Chef::PowerShell object" do
+        expect(object.powershell_exec("$PSVersionTable", :powershell)).to be_kind_of(Chef::PowerShell)
+      end
+
+      it "uses less than version 6" do
+        execution = object.powershell_exec("$PSVersionTable", :powershell)
+        expect(execution.result["PSVersion"].to_s.to_i).to be < 6
+      end
     end
 
     it "runs a command that fails with a non-terminating error and can trap the error via .error?" do
@@ -37,7 +66,11 @@ describe Chef::Mixin::PowershellExec, :windows_only do
       execution = object.powershell_exec("this-should-error")
       expect(execution.errors).to be_a_kind_of(Array)
       expect(execution.errors[0]).to be_a_kind_of(String)
-      expect(execution.errors[0]).to include("Runtime exception: this-should-error")
+      expect(execution.errors[0]).to include("The term 'this-should-error' is not recognized")
+    end
+
+    it "raises an error if the interpreter is invalid" do
+      expect { object.powershell_exec("this-should-error", :powerfart) }.to raise_error(ArgumentError)
     end
   end
 
@@ -49,5 +82,9 @@ describe Chef::Mixin::PowershellExec, :windows_only do
     it "raises an error if the command fails" do
       expect { object.powershell_exec!("this-should-error") }.to raise_error(Chef::PowerShell::CommandFailed)
     end
+
+    it "raises an error if the interpreter is invalid" do
+      expect { object.powershell_exec!("this-should-error", :powerfart) }.to raise_error(ArgumentError)
+    end
   end
 end

data/spec/unit/mixin/powershell_out_spec.rb

@@ -44,6 +44,20 @@ describe Chef::Mixin::PowershellOut, :windows_only do
       expect(object.powershell_out("Get-Process", timeout: 600)).to eql(ret)
     end
 
+    it "uses pwsh.exe when given :pwsh interpreter" do
+      ret = double("Mixlib::ShellOut")
+      expect(object).to receive(:shell_out).with(
+        "pwsh.exe #{flags} -Command \"Get-Process\"",
+        timeout: 600
+      ).and_return(ret)
+      expect(object.powershell_out("Get-Process", :pwsh, timeout: 600)).to eql(ret)
+    end
+
+    it "raises error if interpreter is invalid" do
+      ret = double("Mixlib::ShellOut")
+      expect { object.powershell_out("Get-Process", :blah, timeout: 600) }.to raise_error(ArgumentError)
+    end
+
     context "when double quote is passed in the powershell command" do
       it "passes if double quote is appended with single escape" do
         result = object.powershell_out("Write-Verbose \"Some String\" -Verbose")

data/spec/unit/mixin/securable_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Mixin::Securable do
   describe "unix-specific behavior" do
     before(:each) do
       platform_mock :unix do
-        load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
+        load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
         @securable = Object.new
         @securable.send(:extend, Chef::Mixin::Securable)
         @securable.send(:extend, Chef::Mixin::ParamsValidate)
@@ -176,7 +176,7 @@ describe Chef::Mixin::Securable do
   describe "windows-specific behavior" do
     before(:each) do
       platform_mock :windows do
-        load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
+        load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
         securable_class = Class.new do
           include Chef::Mixin::Securable
           include Chef::Mixin::ParamsValidate

data/spec/unit/mixin/which.rb

@@ -93,7 +93,7 @@ describe Chef::Mixin::Which do
       end
 
       test_which("arrays with blocks", "foo1", "foo2", finds: "/dir2/foo1", others: [ "/dir1/foo2" ]) do |f|
-        raise "bad arg to block" unless f == "/dir2/foo1" || f == "/dir1/foo2"
+        raise "bad arg to block" unless ["/dir2/foo1", "/dir1/foo2"].include?(f)
 
         true
       end

data/spec/unit/node/immutable_collections_spec.rb

@@ -130,7 +130,7 @@ describe Chef::Node::ImmutableMash do
   end
 
   %w{to_h to_hash dup}.each do |immutable_meth|
-    describe "#{immutable_meth}" do
+    describe immutable_meth do
       include_examples "ImmutableMash module", description
     end
   end
@@ -238,7 +238,7 @@ describe Chef::Node::ImmutableArray do
   end
 
   %w{to_a to_array dup}.each do |immutable_meth|
-    describe "#{immutable_meth}" do
+    describe immutable_meth do
       include_examples "ImmutableArray module", description
     end
   end

data/spec/unit/platform/query_helpers_spec.rb

@@ -41,24 +41,23 @@ end
 
 describe "Chef::Platform#dsc_refresh_mode_disabled?" do
   let(:node) { instance_double("Chef::Node") }
-  let(:cmdlet) { instance_double("Chef::Util::Powershell::Cmdlet") }
-  let(:cmdlet_result) { instance_double("Chef::Util::Powershell::CmdletResult") }
+  let(:powershell) { instance_double("Chef::PowerShell") }
 
   it "returns true when RefreshMode is Disabled" do
-    expect(Chef::Util::Powershell::Cmdlet).to receive(:new)
-      .with(node, "Get-DscLocalConfigurationManager", :object)
-      .and_return(cmdlet)
-    expect(cmdlet).to receive(:run!).and_return(cmdlet_result)
-    expect(cmdlet_result).to receive(:return_value).and_return({ "RefreshMode" => "Disabled" })
+    expect(Chef::PowerShell).to receive(:new)
+      .with("Get-DscLocalConfigurationManager")
+      .and_return(powershell)
+    expect(powershell).to receive(:error!)
+    expect(powershell).to receive(:result).and_return({ "RefreshMode" => "Disabled" })
     expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be true
   end
 
   it "returns false when RefreshMode is not Disabled" do
-    expect(Chef::Util::Powershell::Cmdlet).to receive(:new)
-      .with(node, "Get-DscLocalConfigurationManager", :object)
-      .and_return(cmdlet)
-    expect(cmdlet).to receive(:run!).and_return(cmdlet_result)
-    expect(cmdlet_result).to receive(:return_value).and_return({ "RefreshMode" => "LaLaLa" })
+    expect(Chef::PowerShell).to receive(:new)
+      .with("Get-DscLocalConfigurationManager")
+      .and_return(powershell)
+    expect(powershell).to receive(:error!)
+    expect(powershell).to receive(:result).and_return({ "RefreshMode" => "LaLaLa" })
     expect(Chef::Platform.dsc_refresh_mode_disabled?(node)).to be false
   end
 end

data/spec/unit/provider/dsc_resource_spec.rb

@@ -85,14 +85,13 @@ describe Chef::Provider::DscResource do
       node.automatic[:languages][:powershell][:version] = "5.0.10018.0"
       node
     end
-    let(:resource_result) { double("CmdletResult", return_value: { "InDesiredState" => true }, stream: "description") }
-    let(:invoke_dsc_resource) { double("cmdlet", run!: resource_result) }
+    let(:resource_result) { double("PowerShell", result: { "InDesiredState" => true }, verbose: ["description"]) }
     let(:store) { double("ResourceStore", find: resource_records) }
     let(:resource_records) { [] }
 
     before do
       allow(Chef::Util::DSC::ResourceStore).to receive(:instance).and_return(store)
-      allow(Chef::Util::Powershell::Cmdlet).to receive(:new).and_return(invoke_dsc_resource)
+      allow(provider).to receive(:powershell_exec!).and_return(resource_result)
       allow(provider).to receive(:dsc_refresh_mode_disabled?).and_return(true)
     end
 
@@ -112,9 +111,8 @@ describe Chef::Provider::DscResource do
     it "flags the resource as reboot required when required" do
       expect(provider).to receive(:test_resource).and_return(false)
       expect(provider).to receive(:invoke_resource)
-        .and_return(double(stdout: "", return_value: nil))
+        .and_return(double(result: { "RebootRequired" => true }))
       expect(provider).to receive(:add_dsc_verbose_log)
-      expect(provider).to receive(:return_dsc_resource_result).and_return(true)
       expect(provider).to receive(:create_reboot_resource)
       provider.run_action(:run)
     end
@@ -122,9 +120,8 @@ describe Chef::Provider::DscResource do
     it "does not flag the resource as reboot required when not required" do
       expect(provider).to receive(:test_resource).and_return(false)
       expect(provider).to receive(:invoke_resource)
-        .and_return(double(stdout: "", return_value: nil))
+        .and_return(double(stdout: "", result: {}))
       expect(provider).to receive(:add_dsc_verbose_log)
-      expect(provider).to receive(:return_dsc_resource_result).and_return(false)
       expect(provider).to_not receive(:create_reboot_resource)
       provider.run_action(:run)
     end
@@ -142,9 +139,7 @@ describe Chef::Provider::DscResource do
         let(:resource_records) { [{}] }
 
         it "returns the default dsc resource module" do
-          expect(Chef::Util::Powershell::Cmdlet).to receive(:new) do |node, cmdlet, format|
-            expect(cmdlet).to match(/Module PSDesiredStateConfiguration /)
-          end.and_return(invoke_dsc_resource)
+          expect(provider).to receive(:powershell_exec!).with(/Module PSDesiredStateConfiguration /).and_return(resource_result)
           provider.run_action(:run)
         end
       end
@@ -153,9 +148,7 @@ describe Chef::Provider::DscResource do
         let(:resource_records) { [{ "Module" => { "Name" => "ModuleName" } }] }
 
         it "returns the default dsc resource module" do
-          expect(Chef::Util::Powershell::Cmdlet).to receive(:new) do |node, cmdlet, format|
-            expect(cmdlet).to match(/Module ModuleName /)
-          end.and_return(invoke_dsc_resource)
+          expect(provider).to receive(:powershell_exec!).with(/Module ModuleName /).and_return(resource_result)
           provider.run_action(:run)
         end
       end
@@ -286,8 +279,6 @@ describe Chef::Provider::DscResource do
   end
 
   describe "invoke_resource" do
-    let(:cmdlet) { double(run!: nil) }
-
     before(:each) do
       allow(provider).to receive(:translate_type).and_return("my_properties")
       provider.instance_variable_set(:@new_resource, double(
@@ -301,12 +292,8 @@ describe Chef::Provider::DscResource do
       end
 
       it "invokes Invoke-DscResource command with module name" do
-        expect(Chef::Util::Powershell::Cmdlet).to receive(:new).with(
-          node,
-          "Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module my_module -Verbose",
-          "my_output_format"
-        ).and_return(cmdlet)
-        provider.send(:invoke_resource, "my_method", "my_output_format")
+        expect(provider).to receive(:powershell_exec!).with("Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module my_module -Verbose").and_return(nil)
+        provider.send(:invoke_resource, "my_method")
       end
     end
 
@@ -318,12 +305,8 @@ describe Chef::Provider::DscResource do
       end
 
       it "invokes Invoke-DscResource command with module info object" do
-        expect(Chef::Util::Powershell::Cmdlet).to receive(:new).with(
-          node,
-          "Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module @{ModuleName='my_module';ModuleVersion='my_module_version'} -Verbose",
-          "my_output_format"
-        ).and_return(cmdlet)
-        provider.send(:invoke_resource, "my_method", "my_output_format")
+        expect(provider).to receive(:powershell_exec!).with("Invoke-DscResource -Method my_method -Name my_resource -Property my_properties -Module @{ModuleName='my_module';ModuleVersion='my_module_version'} -Verbose").and_return(nil)
+        provider.send(:invoke_resource, "my_method")
       end
     end
   end

data/spec/unit/provider/dsc_script_spec.rb

@@ -99,7 +99,7 @@ describe Chef::Provider::DscScript do
       it "should noop if neither code or command are provided" do
         allow(provider).to receive(:load_current_resource)
         generator = double("Chef::Util::DSC::ConfigurationGenerator")
-        expect(generator).to receive(:configuration_document_from_script_code).with("", anything, anything, anything)
+        expect(generator).to receive(:configuration_document_from_script_code).with("", anything, anything)
         allow(Chef::Util::DSC::ConfigurationGenerator).to receive(:new).and_return(generator)
         provider.send(:generate_configuration_document, "tmp", nil)
       end