chef 16.0.287-universal-mingw32 → 16.2.73-universal-mingw32

data/spec/functional/resource/msu_package_spec.rb

@@ -26,11 +26,17 @@ describe Chef::Resource::MsuPackage, :win2012r2_only do
   let(:package_identity) { "Package_for_KB2959977~31bf3856ad364e35~amd64~~6.3.1.1" }
   let(:timeout) { 3600 }
 
-  let(:new_resource) { Chef::Resource::CabPackage.new("windows_test_pkg") }
-  let(:cab_provider) do
+  let(:run_context) do
     node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
     events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
+    Chef::RunContext.new(node, {}, events)
+  end
+
+  let(:new_resource) { Chef::Resource::CabPackage.new("windows_test_pkg") }
+  let(:cab_provider) do
     Chef::Provider::Package::Cab.new(new_resource, run_context)
   end
 

data/spec/functional/resource/powershell_script_spec.rb

@@ -23,8 +23,8 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
 
   include_context Chef::Resource::WindowsScript
 
-  let (:architecture_command) { "echo $env:PROCESSOR_ARCHITECTURE" }
-  let (:output_command) { " | out-file -encoding ASCII " }
+  let(:architecture_command) { "echo $env:PROCESSOR_ARCHITECTURE" }
+  let(:output_command) { " | out-file -encoding ASCII " }
 
   it_behaves_like "a Windows script running on Windows"
 
@@ -68,8 +68,8 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       end
     end
 
-    let (:negative_exit_status) { -27 }
-    let (:unsigned_exit_status) { (-negative_exit_status ^ 65535) + 1 }
+    let(:negative_exit_status) { -27 }
+    let(:unsigned_exit_status) { (-negative_exit_status ^ 65535) + 1 }
     it "returns the exit status -27 as a signed integer or an unsigned 16-bit 2's complement value of 65509 for a powershell script that exits with -27" do
 
       # Versions of PowerShell prior to 4.0 return a 16-bit unsigned value --

data/spec/functional/resource/remote_file_spec.rb

@@ -134,7 +134,7 @@ describe Chef::Resource::RemoteFile do
       let(:smb_file_local_file_name) { "smb_file.txt" }
       let(:smb_file_local_path) { File.join( smb_share_root_directory, smb_file_local_file_name ) }
       let(:smb_share_name) { "chef_smb_test" }
-      let(:smb_remote_path) { File.join("//#{ENV["COMPUTERNAME"]}", smb_share_name, smb_file_local_file_name).gsub(%r{/}, "\\") }
+      let(:smb_remote_path) { File.join("//#{ENV["COMPUTERNAME"]}", smb_share_name, smb_file_local_file_name).tr("/", "\\") }
       let(:smb_file_content) { "hellofun" }
       let(:local_destination_path) { File.join(Dir.tmpdir, make_tmpname("chef_remote_file")) }
       let(:windows_current_user) { ENV["USERNAME"] }
@@ -155,7 +155,7 @@ describe Chef::Resource::RemoteFile do
       before do
         shell_out("net.exe share #{smb_share_name} /delete")
         File.write(smb_file_local_path, smb_file_content )
-        shell_out!("net.exe share #{smb_share_name}=\"#{smb_share_root_directory.gsub(%r{/}, '\\')}\" /grant:\"authenticated users\",read")
+        shell_out!("net.exe share #{smb_share_name}=\"#{smb_share_root_directory.tr("/", '\\')}\" /grant:\"authenticated users\",read")
       end
 
       after do
@@ -229,8 +229,8 @@ describe Chef::Resource::RemoteFile do
           end
 
           context "when the resource is accessed using an alternate user's identity with no access to the file" do
-            let (:windows_nonadmin_user) { "chefremfile1" }
-            let (:windows_nonadmin_user_password) { "j82ajfxK3;2Xe1" }
+            let(:windows_nonadmin_user) { "chefremfile1" }
+            let(:windows_nonadmin_user_password) { "j82ajfxK3;2Xe1" }
             include_context "a non-admin Windows user"
 
             before do
@@ -246,8 +246,8 @@ describe Chef::Resource::RemoteFile do
         end
 
         context "when the the file is only accessible as a specific alternate identity" do
-          let (:windows_nonadmin_user) { "chefremfile2" }
-          let (:windows_nonadmin_user_password) { "j82ajfxK3;2Xe2" }
+          let(:windows_nonadmin_user) { "chefremfile2" }
+          let(:windows_nonadmin_user_password) { "j82ajfxK3;2Xe2" }
           include_context "a non-admin Windows user"
 
           before do
@@ -279,8 +279,8 @@ describe Chef::Resource::RemoteFile do
           end
 
           context "when the resource is accessed using an alternate user's identity with no access to the file" do
-            let (:windows_nonadmin_user) { "chefremfile3" }
-            let (:windows_nonadmin_user_password) { "j82ajfxK3;2Xe3" }
+            let(:windows_nonadmin_user) { "chefremfile3" }
+            let(:windows_nonadmin_user_password) { "j82ajfxK3;2Xe3" }
             include_context "a non-admin Windows user"
 
             let(:remote_user) { windows_nonadmin_user_qualified }

data/spec/functional/resource/rpm_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
@@ -26,6 +25,7 @@ describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do
+    run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
     new_resource = Chef::Resource::RpmPackage.new(@pkg_name, run_context)
     new_resource.source @pkg_path
     new_resource

data/spec/functional/resource/timezone_spec.rb

@@ -21,6 +21,8 @@ describe Chef::Resource::Timezone, :windows_only do
   let(:timezone) { "GMT Standard Time" }
 
   def timezone_resource
+    run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+
     Chef::Resource::Timezone.new(timezone, run_context)
   end
 

data/spec/functional/resource/windows_package_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 
 describe Chef::Resource::WindowsPackage, :windows_only, :volatile do
   let(:pkg_name) { nil }

data/spec/functional/resource/windows_path_spec.rb

@@ -21,6 +21,10 @@ require "spec_helper"
 describe Chef::Resource::WindowsPath, :windows_only do
   let(:path) { "test_path" }
 
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
   before(:all) do
     @old_path = ENV["PATH"].dup
   end

data/spec/functional/resource/windows_security_policy_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/powershell_out"
 
 describe Chef::Resource::WindowsSecurityPolicy, :windows_only do

data/spec/functional/resource/windows_service_spec.rb

@@ -62,6 +62,10 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
     r
   end
 
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
   before do
     user_resource.run_action(:create)
 

data/spec/functional/resource/windows_task_spec.rb

@@ -25,12 +25,13 @@ describe Chef::Resource::WindowsTask, :windows_only do
   let(:task_name) { "chef-client-functional-test" }
   let(:new_resource) { Chef::Resource::WindowsTask.new(task_name) }
   let(:windows_task_provider) do
-    node = Chef::Node.new
-    events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
     Chef::Provider::WindowsTask.new(new_resource, run_context)
   end
 
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
   describe "action :create" do
     after { delete_task }
     context "when command is with arguments" do
@@ -317,12 +318,12 @@ describe Chef::Resource::WindowsTask, :windows_only do
         expect(subject).not_to be_updated_by_last_action
       end
 
-      it "updates a scheduled task to run every 5 hrs when frequency modifer updated to 5" do
+      it "updates a scheduled task to run every 5 hrs when frequency modifier updated to 5" do
         subject.run_action(:create)
         current_resource = call_for_load_current_resource
         trigger_details = current_resource.task.trigger(0)
         expect(trigger_details[:minutes_interval]).to eq(180)
-        # updating frequency modifer to 5 from 3
+        # updating frequency modifier to 5 from 3
         subject.frequency_modifier 5
         subject.run_action(:create)
         expect(subject).to be_updated_by_last_action
@@ -501,7 +502,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
         it "raises argument error if frequency_modifier is 'first, second' and day is not provided." do
           subject.frequency_modifier "first, second"
-          expect { subject.after_created }.to raise_error("Please select day on which you want to run the task e.g. 'Mon, Tue'. Multiple values must be seprated by comma.")
+          expect { subject.after_created }.to raise_error("Please select day on which you want to run the task e.g. 'Mon, Tue'. Multiple values must be separated by comma.")
         end
 
         it "raises argument error if months is passed along with frequency_modifier" do
@@ -513,13 +514,13 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "not raises any Argument error if frequency_modifier set as 'first, second, third' and day is provided" do
           subject.frequency_modifier "first, second, third"
           subject.day "Mon, Fri"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
         end
 
         it "not raises any Argument error if frequency_modifier 2 " do
           subject.frequency_modifier 2
           subject.day "Mon, Sun"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
         end
 
         it "raises argument error if frequency_modifier > 12" do
@@ -532,10 +533,10 @@ describe Chef::Resource::WindowsTask, :windows_only do
           expect { subject.after_created }.to raise_error("frequency_modifier value 0 is invalid. Valid values for :monthly frequency are 1 - 12, 'FIRST', 'SECOND', 'THIRD', 'FOURTH', 'LAST'.")
         end
 
-        it "creates scheduled task to run task monthly on Monday and Friday of first, second and thrid week of month" do
+        it "creates scheduled task to run task monthly on Monday and Friday of first, second and third week of month" do
           subject.frequency_modifier "first, second, third"
           subject.day "Mon, Fri"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
           call_for_create_action
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
@@ -558,7 +559,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates scheduled task to run task monthly on every 6 months when frequency_modifier is 6 and to run on 1st and 2nd day of month" do
           subject.frequency_modifier 6
           subject.day "1, 2"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
           call_for_create_action
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
@@ -590,7 +591,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
         it "creates scheduled task to run monthly to run last day of the month" do
           subject.day "last"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
           call_for_create_action
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
@@ -611,7 +612,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
         it "day property set as 'lastday' creates scheduled task to run monthly to run last day of the month" do
           subject.day "lastday"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
           call_for_create_action
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
@@ -635,7 +636,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
         it "creates scheduled task to run monthly on last week of the month" do
           subject.frequency_modifier "last"
           subject.day "Mon, Fri"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
           call_for_create_action
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
@@ -659,7 +660,7 @@ describe Chef::Resource::WindowsTask, :windows_only do
       context "when wild card (*) set as months" do
         it "creates the scheduled task to run on 1st day of the all months" do
           subject.months "*"
-          expect { subject.after_created }.not_to raise_error(ArgumentError)
+          expect { subject.after_created }.not_to raise_error
           call_for_create_action
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)

data/spec/functional/resource/windows_user_privilege_spec.rb

@@ -16,7 +16,6 @@
 #
 
 require_relative "../../spec_helper"
-require_relative "../../functional/resource/base"
 
 describe Chef::Resource::WindowsUserPrivilege, :windows_only do
   let(:principal) { nil }

data/spec/functional/resource/yum_package_spec.rb

@@ -16,7 +16,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
@@ -64,6 +63,10 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
     FileUtils.rm_f "/etc/yum.repos.d/chef-yum-localtesting.repo"
   end
 
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
   let(:package_name) { "chef_rpm" }
   let(:yum_package) do
     r = Chef::Resource::YumPackage.new(package_name, run_context)

data/spec/functional/resource/zypper_package_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
@@ -52,6 +51,10 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
     FileUtils.rm_f "/etc/zypp/repos.d/chef-zypp-localtesting.repo"
   end
 
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
   let(:package_name) { "chef_rpm" }
   let(:zypper_package) do
     r = Chef::Resource::ZypperPackage.new(package_name, run_context)

data/spec/functional/shell_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/version"
 require "chef/shell"
 

data/spec/functional/win32/crypto_spec.rb

@@ -32,7 +32,7 @@ describe "Chef::ReservedNames::Win32::Crypto", :windows_only do
       @run_context = Chef::RunContext.new(new_node, {}, events)
     end
 
-    let (:plaintext) { "p@assword" }
+    let(:plaintext) { "p@assword" }
 
     it "can be decrypted by powershell" do
       encrypted = Chef::ReservedNames::Win32::Crypto.encrypt(plaintext)

data/spec/integration/knife/config_use_profile_spec.rb

@@ -30,6 +30,7 @@ describe "knife config use-profile", :workstation do
     knife("config", "use-profile", *cmd_args, instance_filter: lambda { |instance|
       # Fake the failsafe check because this command doesn't actually process knife.rb.
       $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
+      allow(File).to receive(:file?).and_call_original
     })
   end
 
@@ -73,15 +74,56 @@ describe "knife config use-profile", :workstation do
 
   context "with an argument" do
     let(:cmd_args) { %w{production} }
+    before { file(".chef/credentials", <<~EOH) }
+      [production]
+      client_name = "testuser"
+      client_key = "testkey.pem"
+      chef_server_url = "https://example.com/organizations/testorg"
+    EOH
     it do
       is_expected.to eq "Set default profile to production\n"
       expect(File.read(path_to(".chef/context"))).to eq "production\n"
     end
   end
 
+  context "with no credentials file" do
+    let(:cmd_args) { %w{production} }
+    subject { knife_use_profile.stderr }
+    it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
+  end
+
+  context "with an empty credentials file" do
+    let(:cmd_args) { %w{production} }
+    before { file(".chef/credentials", "") }
+    subject { knife_use_profile.stderr }
+    it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
+  end
+
+  context "with an wrong argument" do
+    let(:cmd_args) { %w{staging} }
+    before { file(".chef/credentials", <<~EOH) }
+      [production]
+      client_name = "testuser"
+      client_key = "testkey.pem"
+      chef_server_url = "https://example.com/organizations/testorg"
+    EOH
+    subject { knife_use_profile }
+    it { expect { subject }.to raise_error ChefConfig::ConfigurationError, "Profile staging doesn't exist. Please add it to #{path_to(".chef/credentials")} and if it is profile with DNS name check that you are not missing single quotes around it as per docs https://docs.chef.io/workstation/knife_setup/#knife-profiles." }
+  end
+
   context "with $CHEF_HOME" do
     let(:cmd_args) { %w{staging} }
-    before { ENV["CHEF_HOME"] = path_to("chefhome"); file("chefhome/tmp", "") }
+    before do
+      ENV["CHEF_HOME"] = path_to("chefhome"); file("chefhome/tmp", "")
+      file("chefhome/.chef/credentials", <<~EOH
+      [staging]
+      client_name = "testuser"
+      client_key = "testkey.pem"
+      chef_server_url = "https://example.com/organizations/testorg"
+      EOH
+      )
+    end
+
     it do
       is_expected.to eq "Set default profile to staging\n"
       expect(File.read(path_to("chefhome/.chef/context"))).to eq "staging\n"
@@ -91,7 +133,18 @@ describe "knife config use-profile", :workstation do
 
   context "with $KNIFE_HOME" do
     let(:cmd_args) { %w{development} }
-    before { ENV["KNIFE_HOME"] = path_to("knifehome"); file("knifehome/tmp", "") }
+
+    before do
+      ENV["KNIFE_HOME"] = path_to("knifehome"); file("knifehome/tmp", "")
+      file("knifehome/.chef/credentials", <<~EOH
+      [development]
+      client_name = "testuser"
+      client_key = "testkey.pem"
+      chef_server_url = "https://example.com/organizations/testorg"
+      EOH
+      )
+    end
+
     it do
       is_expected.to eq "Set default profile to development\n"
       expect(File.read(path_to("knifehome/.chef/context"))).to eq "development\n"

data/spec/integration/knife/cookbook_upload_spec.rb

@@ -25,7 +25,7 @@ describe "knife cookbook upload", :workstation do
 
   include_context "default config options"
 
-  let (:cb_dir) { "#{@repository_dir}/cookbooks" }
+  let(:cb_dir) { "#{@repository_dir}/cookbooks" }
 
   when_the_chef_server "is empty" do
     when_the_repository "has a cookbook" do

data/spec/integration/knife/data_bag_from_file_spec.rb

@@ -24,7 +24,7 @@ describe "knife data bag from file", :workstation do
 
   include_context "default config options"
 
-  let (:db_dir) { "#{@repository_dir}/data_bags" }
+  let(:db_dir) { "#{@repository_dir}/data_bags" }
 
   when_the_chef_server "has an empty data bag" do
     before do

data/spec/integration/knife/environment_from_file_spec.rb

@@ -24,7 +24,7 @@ describe "knife environment from file", :workstation do
 
   # include_context "default config options"
 
-  let (:env_dir) { "#{@repository_dir}/environments" }
+  let(:env_dir) { "#{@repository_dir}/environments" }
 
   when_the_chef_server "is empty" do
     when_the_repository "has some environments" do