chef 16.4.35 → 16.6.14

data/lib/chef/util/diff.rb

@@ -40,9 +40,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require "diff/lcs"
-require "diff/lcs/hunk"
-
 class Chef
   class Util
     class Diff
@@ -86,6 +83,9 @@ class Chef
       # produces a unified-output-format diff with 3 lines of context
       # ChefFS uses udiff() directly
       def udiff(old_file, new_file)
+        require "diff/lcs"
+        require "diff/lcs/hunk"
+
         diff_str = ""
         file_length_difference = 0
 

data/lib/chef/util/powershell/cmdlet.rb

@@ -16,7 +16,9 @@
 # limitations under the License.
 #
 
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
 require_relative "../../mixin/windows_architecture_helper"
 require_relative "cmdlet_result"
 

data/lib/chef/util/powershell/ps_credential.rb

@@ -18,24 +18,28 @@
 
 require_relative "../../win32/crypto" if ChefUtils.windows?
 
-class Chef::Util::Powershell
-  class PSCredential
-    def initialize(username, password)
-      @username = username
-      @password = password
-    end
+class Chef
+  class Util
+    class Powershell
+      class PSCredential
+        def initialize(username, password)
+          @username = username
+          @password = password
+        end
 
-    def to_psobject
-      "New-Object System.Management.Automation.PSCredential('#{@username}',('#{encrypt(@password)}' | ConvertTo-SecureString))"
-    end
+        def to_psobject
+          "New-Object System.Management.Automation.PSCredential('#{@username}',('#{encrypt(@password)}' | ConvertTo-SecureString))"
+        end
 
-    alias to_s to_psobject
-    alias to_text to_psobject
+        alias to_s to_psobject
+        alias to_text to_psobject
 
-    private
+        private
 
-    def encrypt(str)
-      Chef::ReservedNames::Win32::Crypto.encrypt(str)
+        def encrypt(str)
+          Chef::ReservedNames::Win32::Crypto.encrypt(str)
+        end
+      end
     end
   end
 end

data/lib/chef/util/threaded_job_queue.rb

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "thread"
-
 class Chef
   class Util
     # A simple threaded job queue

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("16.4.35")
+  VERSION = Chef::VersionString.new("16.6.14")
 end
 
 #

data/lib/chef/win32/crypto.rb

@@ -20,7 +20,7 @@ require_relative "error"
 require_relative "api/memory"
 require_relative "api/crypto"
 require_relative "unicode"
-require "digest"
+require "digest" unless defined?(Digest)
 
 class Chef
   module ReservedNames::Win32

data/lib/chef/win32/file.rb

@@ -124,7 +124,7 @@ class Chef
           # Return the link destination (strip off \??\ at the beginning, which is a local filesystem thing)
           link_dest = reparse_buffer.reparse_buffer.substitute_name
           if /^\\\?\?\\/.match?(link_dest)
-            link_dest = link_dest[4..-1]
+            link_dest = link_dest[4..]
           end
           link_dest
         end

data/lib/chef/win32/registry.rb

@@ -21,9 +21,8 @@ require_relative "api"
 require_relative "../mixin/wide_string"
 
 if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
-  require_relative "../monkey_patches/win32/registry"
+  Win32.autoload :Registry, File.expand_path("../monkey_patches/win32/registry", __dir__)
   require_relative "api/registry"
-  require "win32/registry" unless defined?(Win32::Registry)
   require "win32/api"
 end
 

data/lib/chef/win32/unicode.rb

@@ -40,7 +40,7 @@ module FFI
         last_char = nil
         while last_char != "\000\000"
           length += 1
-          last_char = get_bytes(0, length * 2)[-2..-1]
+          last_char = get_bytes(0, length * 2)[-2..]
         end
 
         num_wchars = length

data/spec/data/shef-config.rb

@@ -7,5 +7,5 @@ ohai[:disabled_plugins] << "solaris2::cpu" << "solaris2::dmi" << "solaris2::file
 ohai[:disabled_plugins] << "solaris2::virtualization" << "solaris2::zpools"
 ohai[:disabled_plugins] << "c" << "php" << "mono" << "groovy" << "lua" << "erlang"
 ohai[:disabled_plugins] << "kernel" << "linux::filesystem" << "ruby"
-chef_repo_path File.dirname(__FILE__)
+chef_repo_path __dir__
 cookbook_path  "#{chef_repo_path}/cookbooks"

data/spec/functional/event_loggers/windows_eventlog_spec.rb

@@ -19,6 +19,7 @@
 require "spec_helper"
 require "securerandom"
 require "chef/event_loggers/windows_eventlog"
+require "chef-utils"
 if ChefUtils.windows?
   require "win32/eventlog"
   include Win32
@@ -49,7 +50,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do
     logger.run_start(version, run_status)
 
     expect(event_log.read(flags, offset).any? do |e|
-      e.source == Chef::Dist::SHORT && e.event_id == 10000 &&
+      e.source == ChefUtils::Dist::Infra::SHORT && e.event_id == 10000 &&
                                         e.string_inserts[0].include?(version)
     end ).to be_truthy
   end
@@ -58,7 +59,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do
     logger.run_started(run_status)
 
     expect(event_log.read(flags, offset).any? do |e|
-      e.source == Chef::Dist::SHORT && e.event_id == 10001 &&
+      e.source == ChefUtils::Dist::Infra::SHORT && e.event_id == 10001 &&
                                         e.string_inserts[0].include?(run_id)
     end ).to be_truthy
   end
@@ -68,7 +69,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do
     logger.run_completed(node)
 
     expect(event_log.read(flags, offset).any? do |e|
-      e.source == Chef::Dist::SHORT && e.event_id == 10002 &&
+      e.source == ChefUtils::Dist::Infra::SHORT && e.event_id == 10002 &&
                                          e.string_inserts[0].include?(run_id) &&
                                          e.string_inserts[1].include?(elapsed_time.to_s)
     end).to be_truthy
@@ -79,7 +80,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do
     logger.run_failed(mock_exception)
 
     expect(event_log.read(flags, offset).any? do |e|
-      e.source == Chef::Dist::SHORT && e.event_id == 10003 &&
+      e.source == ChefUtils::Dist::Infra::SHORT && e.event_id == 10003 &&
         e.string_inserts[0].include?(run_id) &&
         e.string_inserts[1].include?(elapsed_time.to_s) &&
         e.string_inserts[2].include?(mock_exception.class.name) &&
@@ -93,7 +94,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do
     logger.run_failed(mock_exception)
 
     expect(event_log.read(flags, offset).any? do |e|
-      e.source == Chef::Dist::SHORT && e.event_id == 10003 &&
+      e.source == ChefUtils::Dist::Infra::SHORT && e.event_id == 10003 &&
         e.string_inserts[0].include?("UNKNOWN") &&
         e.string_inserts[1].include?("UNKNOWN") &&
         e.string_inserts[2].include?(mock_exception.class.name) &&

data/spec/functional/mixin/powershell_out_spec.rb

@@ -18,7 +18,7 @@
 require "spec_helper"
 require "chef/mixin/powershell_out"
 
-describe Chef::Mixin::PowershellOut, windows_only: true do
+describe Chef::Mixin::PowershellOut, :windows_only do
   include Chef::Mixin::PowershellOut
 
   describe "#powershell_out" do
@@ -26,6 +26,14 @@ describe Chef::Mixin::PowershellOut, windows_only: true do
       expect(powershell_out("get-process").run_command.stdout).to match /Handles/
     end
 
+    it "uses :powershell by default" do
+      expect(powershell_out("$PSVersionTable").run_command.stdout).to match /CLRVersion/
+    end
+
+    it ":pwsh interpreter uses core edition", :pwsh_installed do
+      expect(powershell_out("$PSVersionTable", :pwsh).run_command.stdout).to match /Core/
+    end
+
     it "does not raise exceptions when the command is invalid" do
       powershell_out("this-is-not-a-valid-command").run_command
     end

data/spec/functional/resource/aix_service_spec.rb

@@ -89,7 +89,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
   describe "When service is a subsystem" do
     before(:all) do
-      script_dir = File.join(File.dirname(__FILE__), "/../assets/")
+      script_dir = File.join(__dir__, "/../assets/")
       shell_out!("mkssys -s ctestsys -p #{script_dir}/testchefsubsys -u #{get_user_id} -S -n 15 -f 9 -R -Q")
     end
 
@@ -117,7 +117,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
   # Cannot run this test on a WPAR
   describe "When service is a group", :not_wpar do
     before(:all) do
-      script_dir = File.join(File.dirname(__FILE__), "/../assets/")
+      script_dir = File.join(__dir__, "/../assets/")
       shell_out!("mkssys -s ctestsys -p #{script_dir}/testchefsubsys -u #{get_user_id} -S -n 15 -f 9 -R -Q -G ctestgrp")
     end
 

data/spec/functional/resource/aixinit_service_spec.rb

@@ -69,7 +69,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
 
   before(:all) do
     File.delete("/etc/rc.d/init.d/chefinittest") if File.exist?("/etc/rc.d/init.d/chefinittest")
-    FileUtils.cp((File.join(File.dirname(__FILE__), "/../assets/chefinittest")).to_s, "/etc/rc.d/init.d/chefinittest")
+    FileUtils.cp((File.join(__dir__, "/../assets/chefinittest")).to_s, "/etc/rc.d/init.d/chefinittest")
   end
 
   after(:all) do

data/spec/functional/resource/insserv_spec.rb

@@ -74,7 +74,7 @@ describe Chef::Resource::Service, :requires_root, :opensuse do
 
   before(:all) do
     File.delete("/etc/init.d/inittest") if File.exist?("/etc/init.d/inittest")
-    FileUtils.cp((File.join(File.dirname(__FILE__), "/../assets/inittest")).to_s, "/etc/init.d/inittest")
+    FileUtils.cp((File.join(__dir__, "/../assets/inittest")).to_s, "/etc/init.d/inittest")
     FileUtils.chmod(0755, "/etc/init.d/inittest")
   end
 

data/spec/functional/resource/powershell_script_spec.rb

@@ -47,7 +47,7 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
     r
   end
 
-  describe "when the run action is invoked on Windows" do
+  shared_examples_for "a running powershell script" do
     it "successfully executes a non-cmdlet Windows binary as the last command of the script" do
       resource.code(successful_executable_script_content + " | out-file -encoding ASCII #{script_output_path}")
       resource.returns(0)
@@ -231,22 +231,54 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       resource.only_if { true }
       expect { resource.should_skip?(:run) }.to raise_error(ArgumentError, /guard_interpreter does not support blocks/)
     end
+  end
+
+  context "when using the powershell interpreter" do
+    before do
+      resource.interpreter "powershell"
+    end
+
+    it_behaves_like "a running powershell script"
+
+    it "runs Windows Powershell" do
+      resource.code("$PSVersionTable.PSVersion.Major | out-file -encoding ASCII #{script_output_path}")
+      resource.returns(0)
+      resource.run_action(:run)
+
+      expect(get_script_output.to_i).to be < 6
+    end
+  end
+
+  context "when using the pwsh interpreter", :pwsh_installed do
+    before do
+      resource.interpreter "pwsh"
+    end
+
+    it_behaves_like "a running powershell script"
 
-    context "when dsc is supported", :windows_powershell_dsc_only do
-      it "can execute LCM configuration code" do
-        resource.code <<~EOF
-          configuration LCM
+    it "runs a version of powershell greater than 6" do
+      resource.code("$PSVersionTable.PSVersion.Major | out-file -encoding ASCII #{script_output_path}")
+      resource.returns(0)
+      resource.run_action(:run)
+
+      expect(get_script_output.to_i).to be > 6
+    end
+  end
+
+  context "when dsc is supported", :windows_powershell_dsc_only do
+    it "can execute LCM configuration code" do
+      resource.code <<~EOF
+        configuration LCM
+        {
+          param ($thumbprint)
+          localconfigurationmanager
           {
-            param ($thumbprint)
-            localconfigurationmanager
-            {
-              RebootNodeIfNeeded = $false
-              ConfigurationMode = 'ApplyOnly'
-            }
+            RebootNodeIfNeeded = $false
+            ConfigurationMode = 'ApplyOnly'
           }
-        EOF
-        expect { resource.run_action(:run) }.not_to raise_error
-      end
+        }
+      EOF
+      expect { resource.run_action(:run) }.not_to raise_error
     end
   end
 
@@ -347,6 +379,17 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
 
     context "with powershell_script as the guard_interpreter" do
 
+      context "when pwsh is the interpreter", :pwsh_installed do
+        before do
+          resource.interpreter "pwsh"
+        end
+
+        it "uses powershell core to evaluate the guard" do
+          resource.not_if "$PSVersionTable.PSEdition -eq 'Core'"
+          expect(resource.should_skip?(:run)).to be_truthy
+        end
+      end
+
       it "has a guard_interpreter attribute set to :powershell_script" do
         expect(resource.guard_interpreter).to eq(:powershell_script)
       end

data/spec/functional/resource/user/dscl_spec.rb

@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 
 metadata = {
-  macos_only: true,
+  macos_1013: true,
   requires_root: true,
 }
 

data/spec/functional/resource/user/mac_user_spec.rb

@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 
 metadata = {
-  macos_1014: true,
+  macos_gte_1014: true,
   requires_root: true,
 }
 

data/spec/functional/resource/windows_task_spec.rb

@@ -18,7 +18,7 @@
 
 require "spec_helper"
 require "chef/provider/windows_task"
-require "chef/dist"
+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
@@ -47,37 +47,37 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       context "With Arguments" do
         it "creates scheduled task and sets command arguments" do
-          subject.command "#{Chef::Dist::CLIENT} -W"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W"
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
+          expect(current_resource.task.application_name).to eq(ChefUtils::Dist::Infra::CLIENT)
           expect(current_resource.task.parameters).to eq("-W")
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command "#{Chef::Dist::CLIENT} -W"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W"
           subject.run_action(:create)
-          subject.command "#{Chef::Dist::CLIENT} -W"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W"
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end
 
         it "creates scheduled task and sets command arguments when arguments inclusive single quotes" do
-          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
+          expect(current_resource.task.application_name).to eq(ChefUtils::Dist::Infra::CLIENT)
           expect(current_resource.task.parameters).to eq("-W -L 'C:\\chef\\chef-ad-join.log'")
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           subject.run_action(:create)
-          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{ChefUtils::Dist::Infra::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end
@@ -137,19 +137,19 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       context "Without Arguments" do
         it "creates scheduled task and sets command arguments" do
-          subject.command Chef::Dist::CLIENT
+          subject.command ChefUtils::Dist::Infra::CLIENT
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
+          expect(current_resource.task.application_name).to eq(ChefUtils::Dist::Infra::CLIENT)
           expect(current_resource.task.parameters).to be_empty
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command Chef::Dist::CLIENT
+          subject.command ChefUtils::Dist::Infra::CLIENT
           subject.run_action(:create)
-          subject.command Chef::Dist::CLIENT
+          subject.command ChefUtils::Dist::Infra::CLIENT
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end