chef 16.6.14-universal-mingw32 → 16.7.61-universal-mingw32

data/spec/functional/resource/windows_task_spec.rb

@@ -17,15 +17,14 @@
 #
 
 require "spec_helper"
-require "chef/provider/windows_task"
 require "chef-utils/dist"
 
 describe Chef::Resource::WindowsTask, :windows_only do
   # resource.task.application_name will default to task_name unless resource.command is set
   let(:task_name) { "chef-client-functional-test" }
-  let(:new_resource) { Chef::Resource::WindowsTask.new(task_name) }
+  let(:new_resource) { Chef::Resource::WindowsTask.new(task_name, run_context) }
   let(:windows_task_provider) do
-    Chef::Provider::WindowsTask.new(new_resource, run_context)
+    new_resource.provider_for_action(:create)
   end
 
   let(:run_context) do

data/spec/functional/resource/zypper_package_spec.rb

@@ -96,6 +96,17 @@ describe Chef::Resource::ZypperPackage, :requires_root, :suse_only do
       expect(zypper_package.updated_by_last_action?).to be false
       expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
     end
+
+    it "multipackage installs which result in nils from the superclass" do
+      # this looks weird, it tests an internal condition of the allow_nils behavior where the arrays passed to install_package will have
+      # nil values, and ensures that doesn't wind up creating weirdness in the resulting shell_out that causes it to fail
+      preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+      zypper_package.package_name(%w{chef_rpm chef_rpm})
+      zypper_package.version(["1.2", "1.10"])
+      zypper_package.run_action(:install)
+      expect(zypper_package.updated_by_last_action?).to be true
+      expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.10-1.#{pkg_arch}$")
+    end
   end
 
   context "with versions" do

data/spec/integration/knife/client_key_create_spec.rb

@@ -39,7 +39,7 @@ describe "knife client key create", :workstation do
     it "creates a new client key with an expiration date" do
       date = "2017-12-31T23:59:59Z"
       knife("client key create -k new -e #{date} bah").should_succeed stderr: /^#{out}/, stdout: /.*BEGIN RSA PRIVATE KEY/
-      knife("client key show bah new").should_succeed /expiration_date:.*#{date}/
+      knife("client key show bah new").should_succeed(/expiration_date:.*#{date}/)
     end
 
     it "refuses to add an already existing key" do

data/spec/integration/knife/node_create_spec.rb

@@ -34,7 +34,7 @@ describe "knife node create", :workstation do
 
     it "creates a new validator node" do
       knife("node create bah").should_succeed out
-      knife("node show bah").should_succeed /Node Name:   bah/
+      knife("node show bah").should_succeed(/Node Name:   bah/)
     end
 
     it "refuses to add an existing node" do

data/spec/integration/knife/node_environment_set_spec.rb

@@ -31,7 +31,7 @@ describe "knife node environment set", :workstation do
     end
 
     it "sets an environment on a node" do
-      knife("node environment set cons lisp").should_succeed /chef_environment:.*lisp/
+      knife("node environment set cons lisp").should_succeed(/chef_environment:.*lisp/)
       knife("node show cons -a chef_environment").should_succeed <<~EOM
         cons:
           chef_environment: lisp

data/spec/integration/knife/node_run_list_add_spec.rb

@@ -30,7 +30,7 @@ describe "knife node run list add", :workstation do
     end
 
     it "sets the run list" do
-      knife("node run list add cons recipe[foo]").should_succeed /run_list:\s*recipe\[foo\]\n/
+      knife("node run list add cons recipe[foo]").should_succeed(/run_list:\s*recipe\[foo\]\n/)
     end
   end
 
@@ -40,15 +40,15 @@ describe "knife node run list add", :workstation do
     end
 
     it "appends to the run list" do
-      knife("node run list add cons recipe[foo]").should_succeed /run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m
+      knife("node run list add cons recipe[foo]").should_succeed(/run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m)
     end
 
     it "adds to the run list before the specified item" do
-      knife("node run list add cons -b recipe[bar] recipe[foo]").should_succeed /run_list:\n\s*recipe\[foo\]\n\s*recipe\[bar\]\n/m
+      knife("node run list add cons -b recipe[bar] recipe[foo]").should_succeed(/run_list:\n\s*recipe\[foo\]\n\s*recipe\[bar\]\n/m)
     end
 
     it "adds to the run list after the specified item" do
-      knife("node run list add cons -a recipe[bar] recipe[foo]").should_succeed /run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m
+      knife("node run list add cons -a recipe[bar] recipe[foo]").should_succeed(/run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m)
     end
   end
 end

data/spec/integration/knife/node_run_list_remove_spec.rb

@@ -30,7 +30,7 @@ describe "knife node run list remove", :workstation do
     end
 
     it "removes the item from the run list" do
-      knife("node run list remove cons recipe[bar]").should_succeed /run_list:\s*recipe\[foo\]\n/m
+      knife("node run list remove cons recipe[bar]").should_succeed(/run_list:\s*recipe\[foo\]\n/m)
     end
   end
 end

data/spec/integration/knife/node_run_list_set_spec.rb

@@ -30,7 +30,7 @@ describe "knife node run list set", :workstation do
     end
 
     it "sets the run list" do
-      knife("node run list set cons recipe[bar]").should_succeed /run_list:\s*recipe\[bar\]\n/m
+      knife("node run list set cons recipe[bar]").should_succeed(/run_list:\s*recipe\[bar\]\n/m)
     end
 
     it "with no role or recipe" do

data/spec/integration/knife/node_show_spec.rb

@@ -30,7 +30,7 @@ describe "knife node show", :workstation do
     end
 
     it "shows the node" do
-      knife("node show cons").should_succeed /Run List:\s*recipe\[bar\], recipe\[foo\]\n/m
+      knife("node show cons").should_succeed(/Run List:\s*recipe\[bar\], recipe\[foo\]\n/m)
     end
   end
 end

data/spec/integration/recipes/notifies_spec.rb

@@ -416,7 +416,7 @@ describe "notifications" do
       EOM
 
       result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
-      expect(result.stdout).to match /\* log\[a, b\] action write/
+      expect(result.stdout).to match(/\* log\[a, b\] action write/)
       result.error!
     end
 

data/spec/integration/recipes/provider_choice.rb

@@ -30,8 +30,8 @@ describe "Recipe DSL methods" do
         recipe = converge do
           provider_thingy("blah") {}
         end
-        expect(recipe.logged_warnings).to match /hello from Chef::Provider::ProviderThingy/
-        expect(recipe.logged_warnings).to match /you must use 'provides' to provide DSL/i
+        expect(recipe.logged_warnings).to match(/hello from Chef::Provider::ProviderThingy/)
+        expect(recipe.logged_warnings).to match(/you must use 'provides' to provide DSL/i)
       end
     end
   end

data/spec/support/lib/chef/resource/cat.rb

@@ -29,7 +29,7 @@ class Chef
       end
 
       def pretty_kitty(arg = nil)
-        if arg == true || arg == false
+        if [true, false].include?(arg)
           @pretty_kitty = arg
         end
         @pretty_kitty

data/spec/support/lib/chef/resource/one_two_three_four.rb

@@ -26,7 +26,7 @@ class Chef
       end
 
       def something(arg = nil)
-        if arg == true || arg == false
+        if [true, false].include?(arg)
           @something = arg
         end
         @something

data/spec/support/mock/platform.rb

@@ -5,21 +5,29 @@
 # 'i386-mingw32' (windows) or 'x86_64-darwin11.2.0' (unix).  Useful for
 # testing code that mixes in platform specific modules like +Chef::Mixin::Securable+
 # or +Chef::FileAccessControl+
-def platform_mock(platform = :unix)
-  allow(ChefUtils).to receive(:windows?).and_return(platform == :windows ? true : false)
-  ENV["SYSTEMDRIVE"] = (platform == :windows ? "C:" : nil)
+RSpec.configure do |c|
+  c.include(Module.new do
+    def platform_mock(platform = :unix)
+      case platform
+      when :windows
+        Chef::Config.set_defaults_for_windows
+        allow(ChefUtils).to receive(:windows?).and_return(true)
+        stub_const("ENV", ENV.to_hash.merge("SYSTEMDRIVE" => "C:"))
+        stub_const("RUBY_PLATFORM", "i386-mingw32")
+        stub_const("File::PATH_SEPARATOR", ";")
+        stub_const("File::ALT_SEPARATOR", "\\")
+      when :unix
+        Chef::Config.set_defaults_for_nix
+        allow(ChefUtils).to receive(:windows?).and_return(false)
+        stub_const("ENV", ENV.to_hash.merge("SYSTEMDRIVE" => nil))
+        stub_const("RUBY_PLATFORM", "x86_64-darwin11.2.0")
+        stub_const("File::PATH_SEPARATOR", ":")
+        stub_const("File::ALT_SEPARATOR", nil)
+      else
+        raise "#{__method__}: unrecognized platform '#{platform}', expected one of ':unix' or ':windows'"
+      end
 
-  if platform == :windows
-    Chef::Config.set_defaults_for_windows
-  else
-    Chef::Config.set_defaults_for_nix
-  end
-
-  if block_given?
-    mock_constants({ "RUBY_PLATFORM" => (platform == :windows ? "i386-mingw32" : "x86_64-darwin11.2.0"),
-                     "File::PATH_SEPARATOR" => (platform == :windows ? ";" : ":"),
-                     "File::ALT_SEPARATOR" => (platform == :windows ? "\\" : nil) }) do
-                       yield
-                     end
-  end
+      yield
+    end
+  end)
 end

data/spec/support/platform_helpers.rb

@@ -2,11 +2,9 @@ require "fcntl"
 require "chef/mixin/shell_out"
 require "ohai/mixin/http_helper"
 require "ohai/mixin/gce_metadata"
-require "chef/mixin/powershell_out"
 
 class ShellHelpers
   extend Chef::Mixin::ShellOut
-  extend Chef::Mixin::PowershellOut
 end
 
 # magic stolen from bundler/spec/support/less_than_proc.rb
@@ -242,11 +240,15 @@ def ifconfig?
 end
 
 def choco_installed?
-  result = ShellHelpers.powershell_out("choco --version")
+  result = ShellHelpers.shell_out("choco --version")
   result.stderr.empty?
+rescue
+  false
 end
 
 def pwsh_installed?
-  result = ShellHelpers.powershell_out("pwsh.exe --version")
+  result = ShellHelpers.shell_out("pwsh.exe --version")
   result.stderr.empty?
+rescue
+  false
 end

data/spec/support/shared/unit/knife_shared.rb

@@ -33,7 +33,7 @@ shared_examples_for "mandatory field missing" do
 
     it "prints a relevant error message" do
       expect { knife.run }.to raise_error(SystemExit)
-      expect(stderr.string).to match /You must specify a #{fieldname}/
+      expect(stderr.string).to match(/You must specify a #{fieldname}/)
     end
   end
 end

data/spec/support/shared/unit/script_resource.rb

@@ -47,16 +47,16 @@ shared_examples_for "a script resource" do
   end
 
   describe "when executing guards" do
-    it "inherits exactly the :cwd, :environment, :group, :path, :user, and :umask attributes from a parent resource class" do
+    it "inherits exactly the :cwd, :domain, :environment, :group, :password, :path, :user, and :umask attributes from a parent resource class" do
       inherited_difference = Chef::Resource::Script.guard_inherited_attributes -
-        %i{cwd environment group path user umask}
+        %i{cwd domain environment group password path user umask}
 
       expect(inherited_difference).to eq([])
     end
 
     it "when guard_interpreter is set to the default value, the guard command string should be evaluated by command execution and not through a resource" do
       expect_any_instance_of(Chef::Resource::Conditional).not_to receive(:evaluate_block)
-      expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).not_to receive(:evaluate_action)
+      expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).not_to receive(:evaluate)
       expect_any_instance_of(Chef::GuardInterpreter::DefaultGuardInterpreter).to receive(:evaluate).and_return(true)
       script_resource.only_if "echo hi"
       expect(script_resource.should_skip?(:run)).to eq(nil)
@@ -65,7 +65,7 @@ shared_examples_for "a script resource" do
     it "when a valid guard_interpreter resource is specified, a block should be used to evaluate the guard" do
       expect_any_instance_of(Chef::Resource::Conditional).not_to receive(:evaluate_block)
       expect_any_instance_of(Chef::GuardInterpreter::DefaultGuardInterpreter).not_to receive(:evaluate)
-      expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(true)
+      expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate).and_return(true)
       script_resource.guard_interpreter :script
       script_resource.only_if "echo hi"
       expect(script_resource.should_skip?(:run)).to eq(nil)

data/spec/support/shared/unit/windows_script_resource.rb

@@ -35,7 +35,7 @@ shared_examples_for "a Windows script resource" do
     end
 
     it "should use a resource to evaluate the guard when guard_interpreter is not specified" do
-      expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate_action).and_return(true)
+      expect_any_instance_of(Chef::GuardInterpreter::ResourceGuardInterpreter).to receive(:evaluate).and_return(true)
       expect_any_instance_of(Chef::GuardInterpreter::DefaultGuardInterpreter).not_to receive(:evaluate)
       windows_script_resource.only_if "echo hi"
       expect(windows_script_resource.should_skip?(:run)).to eq(nil)

data/spec/unit/client_spec.rb

@@ -801,4 +801,20 @@ describe Chef::Client do
       allow_any_instance_of(Chef::RunLock).to receive(:save_pid).and_raise(NoMethodError)
     end
   end
+
+  describe "deprecated enforce_path_sanity" do
+    include_context "a client run"
+    include_context "converge completed"
+
+    it "print a warning, when enforce_path_sanity is passed" do
+      Chef::Config[:enforce_path_sanity] = true
+      expect(logger).to receive(:warn).with("`enforce_path_sanity` is deprecated, please use `enforce_default_paths` instead!")
+      client.run
+    end
+
+    it "should not print a warning, when enforce_path_sanity is not passed" do
+      expect(logger).not_to receive(:warn).with("`enforce_path_sanity` is deprecated, please use `enforce_default_paths` instead!")
+      client.run
+    end
+  end
 end

data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb

@@ -93,8 +93,8 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
     end
 
     describe "script command opts switch" do
-      let(:command_opts) { {} }
-      let(:guard_interpreter) { Chef::GuardInterpreter::ResourceGuardInterpreter.new(parent_resource, "exit 0", command_opts) }
+      let(:guard_interpreter) { Chef::GuardInterpreter::ResourceGuardInterpreter.new(parent_resource, "exit 0", {}) }
+      let(:resource) { guard_interpreter.instance_variable_get("@resource") }
 
       context "resource is a Script" do
         context "and guard_interpreter is a :script" do
@@ -117,9 +117,9 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
             end
           end
 
-          it "merges to :code" do
-            expect(command_opts).to receive(:merge).with({ code: "exit 0" }).and_call_original
-            expect(guard_interpreter.evaluate).to eq(true)
+          it "assigns the comand to the resource's code property" do
+            guard_interpreter.evaluate
+            expect(resource.code).to eq("exit 0")
           end
         end
 
@@ -130,9 +130,9 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
             parent_resource
           end
 
-          it "merges to :code" do
-            expect(command_opts).to receive(:merge).with({ command: "exit 0" }).and_call_original
-            expect(guard_interpreter.evaluate).to eq(true)
+          it "assigns the comand to the resource's command property" do
+            guard_interpreter.evaluate
+            expect(resource.command).to eq("exit 0")
           end
         end
       end
@@ -144,9 +144,9 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
           parent_resource
         end
 
-        it "merges to :command" do
-          expect(command_opts).to receive(:merge).with({ command: "exit 0" }).and_call_original
-          expect(guard_interpreter.evaluate).to eq(true)
+        it "assigns the comand to the resource's command property" do
+          guard_interpreter.evaluate
+          expect(resource.command).to eq("exit 0")
         end
       end
 

data/spec/unit/knife/client_create_spec.rb

@@ -81,7 +81,7 @@ describe Chef::Knife::ClientCreate do
 
         it "prints a relevant error message" do
           expect { knife.run }.to raise_error(SystemExit)
-          expect(stderr.string).to match /You cannot pass --public-key and --prevent-keygen/
+          expect(stderr.string).to match(/You cannot pass --public-key and --prevent-keygen/)
         end
       end
 
@@ -93,7 +93,7 @@ describe Chef::Knife::ClientCreate do
       it "should print a message upon creation" do
         expect(knife).to receive(:create_client)
         knife.run
-        expect(stderr.string).to match /Created client.*adam/i
+        expect(stderr.string).to match(/Created client.*adam/i)
       end
 
       it "should set the Client name" do

data/spec/unit/knife/configure_client_spec.rb

@@ -59,21 +59,21 @@ describe Chef::Knife::ConfigureClient do
         allow(FileUtils).to receive(:mkdir_p)
         @knife.run
         expect(@client_file.string).to match %r{chef_server_url\s+'https\://chef\.example\.com'}
-        expect(@client_file.string).to match /validation_client_name\s+'chef-validator'/
+        expect(@client_file.string).to match(/validation_client_name\s+'chef-validator'/)
       end
 
       it "should write out the validation.pem file" do
         allow(FileUtils).to receive(:mkdir_p)
         @knife.run
-        expect(@validation_file.string).to match /foo_bar_baz/
+        expect(@validation_file.string).to match(/foo_bar_baz/)
       end
 
       it "should print information on what is being configured" do
         allow(FileUtils).to receive(:mkdir_p)
         @knife.run
-        expect(@stderr.string).to match /creating client configuration/i
-        expect(@stderr.string).to match /writing client\.rb/i
-        expect(@stderr.string).to match /writing validation\.pem/i
+        expect(@stderr.string).to match(/creating client configuration/i)
+        expect(@stderr.string).to match(/writing client\.rb/i)
+        expect(@stderr.string).to match(/writing validation\.pem/i)
       end
     end
   end

data/spec/unit/knife/configure_spec.rb

@@ -157,9 +157,9 @@ describe Chef::Knife::Configure do
     expect(::File).to receive(:open).with("/home/you/.chef/credentials", "w").and_yield config_file
     @knife.config[:repository] = "/home/you/chef-repo"
     @knife.run
-    expect(config_file.string).to match(/^client_name[\s]+=[\s]+'#{Etc.getlogin}'$/)
-    expect(config_file.string).to match(%r{^client_key[\s]+=[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
-    expect(config_file.string).to match(/^chef_server_url\s+=[\s]+'#{default_server_url}'$/)
+    expect(config_file.string).to match(/^client_name\s+=\s+'#{Etc.getlogin}'$/)
+    expect(config_file.string).to match(%r{^client_key\s+=\s+'/home/you/.chef/#{Etc.getlogin}.pem'$})
+    expect(config_file.string).to match(/^chef_server_url\s+=\s+'#{default_server_url}'$/)
   end
 
   it "creates a new client when given the --initial option" do

data/spec/unit/knife/cookbook_delete_spec.rb

@@ -152,7 +152,7 @@ describe Chef::Knife::CookbookDelete do
 
       it "should print an error" do
         @knife.available_versions
-        expect(@stderr.string).to match /error.+cannot find a cookbook named foobar/i
+        expect(@stderr.string).to match(/error.+cannot find a cookbook named foobar/i)
       end
 
       it "should return nil" do
@@ -204,7 +204,7 @@ describe Chef::Knife::CookbookDelete do
     it "should output that the cookbook was deleted" do
       allow(@knife).to receive(:delete_request)
       @knife.delete_version_without_confirmation("1.0.0")
-      expect(@stderr.string).to match /deleted cookbook\[foobar\]\[1.0.0\]/im
+      expect(@stderr.string).to match(/deleted cookbook\[foobar\]\[1.0.0\]/im)
     end
 
     describe "with --print-after" do

data/spec/unit/knife/cookbook_download_spec.rb

@@ -138,9 +138,9 @@ describe Chef::Knife::CookbookDownload do
             expect(File).to receive(:exist?).with("/var/tmp/chef/foobar-1.0.0").and_return(false)
             @knife.run
             %w{attributes recipes templates}.each do |segment|
-              expect(@stderr.string).to match /downloading #{segment}/im
+              expect(@stderr.string).to match(/downloading #{segment}/im)
             end
-            expect(@stderr.string).to match /downloading foobar cookbook version 1\.0\.0/im
+            expect(@stderr.string).to match(/downloading foobar cookbook version 1\.0\.0/im)
             expect(@stderr.string).to match %r{cookbook downloaded to /var/tmp/chef/foobar-1\.0\.0}im
           end