chef 16.4.38-universal-mingw32 → 16.7.61-universal-mingw32

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.38")
+  VERSION = Chef::VersionString.new("16.7.61")
 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/security/sid.rb

@@ -321,7 +321,7 @@ class Chef
             while status == ERROR_MORE_DATA
               status = NetUserEnum(servername, level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle)
 
-              if status == NERR_Success || status == ERROR_MORE_DATA
+              if [NERR_Success, ERROR_MORE_DATA].include?(status)
                 Array.new(entriesread.read_long) do |i|
                   user_info = USER_INFO_3.new(bufptr.read_pointer + i * USER_INFO_3.size)
                   # Check if the account is the Administrator account

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,12 +18,20 @@
 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
     it "runs a powershell command and collects stdout" do
-      expect(powershell_out("get-process").run_command.stdout).to match /Handles/
+      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
@@ -33,7 +41,7 @@ describe Chef::Mixin::PowershellOut, windows_only: true do
 
   describe "#powershell_out!" do
     it "runs a powershell command and collects stdout" do
-      expect(powershell_out!("get-process").run_command.stdout).to match /Handles/
+      expect(powershell_out!("get-process").run_command.stdout).to match(/Handles/)
     end
 
     it "raises exceptions when the command is invalid" do

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/apt_package_spec.rb

@@ -39,9 +39,7 @@ module AptServer
   def tcp_test_port(hostname, port)
     tcp_socket = TCPSocket.new(hostname, port)
     true
-  rescue Errno::ETIMEDOUT
-    false
-  rescue Errno::ECONNREFUSED
+  rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED
     false
   ensure
     tcp_socket && tcp_socket.close
@@ -326,7 +324,7 @@ describe Chef::Resource::AptPackage, metadata do
         pkg_check = shell_out!("dpkg -l chef-integration-test", returns: [0, 1])
 
         if pkg_check.exitstatus == 0
-          expect(pkg_check.stdout).to match(/un[\s]+chef-integration-test/)
+          expect(pkg_check.stdout).to match(/un\s+chef-integration-test/)
         end
       end
 
@@ -359,7 +357,7 @@ describe Chef::Resource::AptPackage, metadata do
       it "upgrades the package for action :upgrade" do
         package_resource.run_action(:upgrade)
         dpkg_l = shell_out!("dpkg -l chef-integration-test", returns: [0])
-        expect(dpkg_l.stdout).to match(/chef\-integration\-test[\s]+1\.1\-1/)
+        expect(dpkg_l.stdout).to match(/chef\-integration\-test\s+1\.1\-1/)
         expect(package_resource).to be_updated_by_last_action
       end
 
@@ -373,7 +371,7 @@ describe Chef::Resource::AptPackage, metadata do
         it "upgrades the package for action :install" do
           package_resource.run_action(:install)
           dpkg_l = shell_out!("dpkg -l chef-integration-test", returns: [0])
-          expect(dpkg_l.stdout).to match(/chef\-integration\-test[\s]+1\.1\-1/)
+          expect(dpkg_l.stdout).to match(/chef\-integration\-test\s+1\.1\-1/)
           expect(package_resource).to be_updated_by_last_action
         end
       end

data/spec/functional/resource/chocolatey_package_spec.rb

@@ -16,13 +16,13 @@
 # limitations under the License.
 #
 require "spec_helper"
-require "chef/mixin/powershell_out"
+require "chef/mixin/shell_out"
 
 describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
-  include Chef::Mixin::PowershellOut
+  include Chef::Mixin::ShellOut
 
   let(:package_name) { "test-A" }
-  let(:package_list) { proc { powershell_out!("choco list -lo -r #{Array(package_name).join(" ")}").stdout.chomp } }
+  let(:package_list) { proc { shell_out!("choco list -lo -r #{Array(package_name).join(" ")}").stdout.chomp } }
   let(:package_source) { File.join(CHEF_SPEC_ASSETS, "chocolatey_feed") }
 
   let(:run_context) do

data/spec/functional/resource/cron_spec.rb

@@ -26,7 +26,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
   # Platform specific validation routines.
   def cron_should_exists(cron_name, command)
     case ohai[:platform]
-    when "aix", "opensolaris", "solaris2", "omnios"
+    when "aix", "solaris2", "omnios"
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(0)
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").stdout.lines.to_a.size).to eq(1)
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{command}\"").exitstatus).to eq(0)
@@ -41,7 +41,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
 
   def cron_should_not_exists(cron_name)
     case ohai[:platform]
-    when "aix", "opensolaris", "solaris2", "omnios"
+    when "aix", "solaris2", "omnios"
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(1)
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{new_resource.command}\"").stdout.lines.to_a.size).to eq(0)
     else
@@ -113,7 +113,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
     end
   end
 
-  exclude_solaris = %w{solaris opensolaris solaris2 omnios}.include?(ohai[:platform])
+  exclude_solaris = %w{solaris solaris2 omnios}.include?(ohai[:platform])
   describe "create action with various attributes", external: exclude_solaris do
     def create_and_validate_with_property(resource, attribute, value)
       if ohai[:platform] == "aix"

data/spec/functional/resource/dsc_script_spec.rb

@@ -17,13 +17,13 @@
 #
 
 require "spec_helper"
-require "chef/mixin/powershell_out"
+require "chef/mixin/powershell_exec"
 require "chef/mixin/windows_architecture_helper"
 require "support/shared/integration/integration_helper"
 
 describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
   include Chef::Mixin::WindowsArchitectureHelper
-  include Chef::Mixin::PowershellOut
+  include Chef::Mixin::PowershellExec
   before(:all) do
     @temp_dir = ::Dir.mktmpdir("dsc-functional-test")
     # enable the HTTP listener if it is not already enabled needed by underlying DSC engine
@@ -33,7 +33,7 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
         winrm create winrm/config/Listener?Address=*+Transport=HTTP
       }
     CODE
-    powershell_out!(winrm_code)
+    powershell_exec!(winrm_code)
   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/mount_spec.rb

@@ -129,8 +129,9 @@ describe Chef::Resource::Mount, :requires_root, external: include_flag do
   end
 
   # Actual tests begin here.
-  before(:all) do
+  before do |test|
     @device, @fstype = setup_device_for_mount
+    @device = "/" if test.metadata[:skip_before]
 
     @mount_point = Dir.mktmpdir("testmount")
 
@@ -145,13 +146,20 @@ describe Chef::Resource::Mount, :requires_root, external: include_flag do
   end
 
   after(:all) do
-    Dir.rmdir(@mount_point)
+    Dir.rmdir(@mount_point) if @mount_point
   end
 
   after(:each) do
     cleanup_mount(new_resource.mount_point)
   end
 
+  describe "when device is '/'" do
+    it "should mount the filesystem if device is '/'", :skip_before do
+      new_resource.run_action(:mount)
+      mount_should_exist(new_resource.mount_point, new_resource.device)
+    end
+  end
+
   describe "when the target state is a mounted filesystem" do
     it "should mount the filesystem if it isn't mounted" do
       expect(current_resource.enabled).to be_falsey

data/spec/functional/resource/powershell_package_source_spec.rb

@@ -0,0 +1,107 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require "spec_helper"
+require "chef/mixin/powershell_exec"
+
+describe Chef::Resource::PowershellPackageSource, :windows_gte_10 do
+  include Chef::Mixin::PowershellExec
+
+  let(:source_name) { "fake" }
+  let(:url) { "https://www.nuget.org/api/v2" }
+  let(:trusted) { true }
+
+  let(:run_context) do
+    Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+  end
+
+  subject do
+    new_resource = Chef::Resource::PowershellPackageSource.new("test powershell package source", run_context)
+    new_resource.source_name source_name
+    new_resource.url url
+    new_resource.trusted trusted
+    new_resource.provider_name provider_name
+    new_resource
+  end
+
+  let(:provider) do
+    provider = subject.provider_for_action(subject.action)
+    provider
+  end
+
+  shared_examples "package_source" do
+    context "register a package source" do
+      after { remove_package_source }
+
+      it "registers the package source" do
+        subject.run_action(:register)
+        expect(get_installed_package_source_name).to eq(source_name)
+      end
+
+      it "does not register the package source if already installed" do
+        subject.run_action(:register)
+        subject.run_action(:register)
+        expect(subject).not_to be_updated_by_last_action
+      end
+
+      it "updates an existing package source if changed" do
+        subject.run_action(:register)
+        subject.trusted !trusted
+        subject.run_action(:register)
+        expect(subject).to be_updated_by_last_action
+      end
+    end
+
+    context "unregister a package source" do
+      it "unregisters the package source" do
+        subject.run_action(:register)
+        subject.run_action(:unregister)
+        expect(get_installed_package_source_name).to be_empty
+      end
+
+      it "does not unregister the package source if not already installed" do
+        subject.run_action(:unregister)
+        expect(subject).not_to be_updated_by_last_action
+      end
+    end
+  end
+
+  context "with NuGet provider" do
+    let(:provider_name) { "NuGet" }
+
+    before(:all) do
+      powershell_exec!("[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;Install-PackageProvider -Name NuGet -Force")
+    end
+
+    it_behaves_like "package_source"
+  end
+
+  context "with PowerShellGet provider" do
+    let(:provider_name) { "PowerShellGet" }
+
+    it_behaves_like "package_source"
+  end
+
+  def get_installed_package_source_name
+    powershell_exec!("(Get-PackageSource -Name #{source_name} -ErrorAction SilentlyContinue).Name").result
+  end
+
+  def remove_package_source
+    pkg_to_remove = Chef::Resource::PowershellPackageSource.new(source_name, run_context)
+    pkg_to_remove.run_action(:unregister)
+  end
+end