chef 17.10.114 → 18.0.169

data/lib/chef/resource/habitat_user_toml.rb

@@ -16,7 +16,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class HabitatUserToml < Chef::Resource
-      unified_mode true
       provides :habitat_user_toml
 
       description "Use the **habitat_user_toml** to template a `user.toml` for Chef Habitat services. Configurations set in the  `user.toml` override the `default.toml` for a given package, which makes it an alternative to applying service group level configuration."

data/lib/chef/resource/homebrew_cask.rb

@@ -23,7 +23,6 @@ require_relative "../mixin/homebrew_user"
 class Chef
   class Resource
     class HomebrewCask < Chef::Resource
-      unified_mode true
 
       provides(:homebrew_cask) { true }
 
@@ -46,24 +45,25 @@ class Chef
         default: true
 
       property :homebrew_path, String,
-        description: "The path to the homebrew binary."
+        description: "The path to the homebrew binary.",
+        default: "/usr/local/bin/brew"
 
       property :owner, [String, Integer],
         description: "The owner of the Homebrew installation.",
         default: lazy { find_homebrew_username },
-        default_description: "Calculated default username"
+        default_description: "Calculated default username"\
 
       action :install, description: "Install an application that is packaged as a Homebrew cask." do
         if new_resource.install_cask
           homebrew_tap "homebrew/cask" do
-            homebrew_path homebrew_bin_path(new_resource.homebrew_path)
+            homebrew_path new_resource.homebrew_path
             owner new_resource.owner
           end
         end
 
         unless casked?
           converge_by("install cask #{new_resource.cask_name} #{new_resource.options}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} install --cask #{new_resource.cask_name} #{new_resource.options}",
+            shell_out!("#{new_resource.homebrew_path} install --cask #{new_resource.cask_name} #{new_resource.options}",
               user: new_resource.owner,
               env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
               cwd: ::Dir.home(new_resource.owner))
@@ -74,14 +74,14 @@ class Chef
       action :remove, description: "Remove an application that is packaged as a Homebrew cask." do
         if new_resource.install_cask
           homebrew_tap "homebrew/cask" do
-            homebrew_path homebrew_bin_path(new_resource.homebrew_path)
+            homebrew_path new_resource.homebrew_path
             owner new_resource.owner
           end
         end
 
         if casked?
           converge_by("uninstall cask #{new_resource.cask_name}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} uninstall --cask #{new_resource.cask_name}",
+            shell_out!("#{new_resource.homebrew_path} uninstall --cask #{new_resource.cask_name}",
               user: new_resource.owner,
               env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
               cwd: ::Dir.home(new_resource.owner))
@@ -99,7 +99,7 @@ class Chef
         # @return [Boolean]
         def casked?
           unscoped_name = new_resource.cask_name.split("/").last
-          shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} list --cask 2>/dev/null",
+          shell_out!("#{new_resource.homebrew_path} list --cask 2>/dev/null",
             user: new_resource.owner,
             env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
             cwd: ::Dir.home(new_resource.owner)).stdout.split.include?(unscoped_name)

data/lib/chef/resource/homebrew_package.rb

@@ -24,7 +24,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class HomebrewPackage < Chef::Resource::Package
-      unified_mode true
 
       provides :homebrew_package
       provides :package, os: "darwin"
@@ -62,7 +61,7 @@ class Chef
       DOC
 
       property :homebrew_user, [ String, Integer ],
-        description: "The name or uid of the Homebrew owner to be used by #{ChefUtils::Dist::Infra::PRODUCT} when executing a command.\n\n#{ChefUtils::Dist::Infra::PRODUCT}, by default, will attempt to execute a Homebrew command as the owner of the `/usr/local/bin/brew` executable on x86_64 machines or `/opt/homebrew/bin/brew` executable on arm64 machines. If that executable does not exist, #{ChefUtils::Dist::Infra::PRODUCT} will attempt to find the user by executing `which brew`. If that executable cannot be found, #{ChefUtils::Dist::Infra::PRODUCT} will print an error message: `Could not find the 'brew' executable in /usr/local/bin, /opt/homebrew/bin, or anywhere on the path.`.\n\nSet this property to specify the Homebrew owner for situations where Chef Infra Client cannot automatically detect the correct owner.'"
+        description: "The name or uid of the Homebrew owner to be used by #{ChefUtils::Dist::Infra::PRODUCT} when executing a command.\n\n#{ChefUtils::Dist::Infra::PRODUCT}, by default, will attempt to execute a Homebrew command as the owner of the `/usr/local/bin/brew` executable. If that executable does not exist, #{ChefUtils::Dist::Infra::PRODUCT} will attempt to find the user by executing `which brew`. If that executable cannot be found, #{ChefUtils::Dist::Infra::PRODUCT} will print an error message: `Could not find the 'brew' executable in /usr/local/bin or anywhere on the path.`.\n\nSet this property to specify the Homebrew owner for situations where Chef Infra Client cannot automatically detect the correct owner.'"
 
     end
   end

data/lib/chef/resource/homebrew_tap.rb

@@ -23,7 +23,6 @@ require_relative "../mixin/homebrew_user"
 class Chef
   class Resource
     class HomebrewTap < Chef::Resource
-      unified_mode true
 
       provides(:homebrew_tap) { true }
 
@@ -42,7 +41,8 @@ class Chef
         description: "The URL of the tap."
 
       property :homebrew_path, String,
-        description: "The path to the Homebrew binary."
+        description: "The path to the Homebrew binary.",
+        default: "/usr/local/bin/brew"
 
       property :owner, String,
         description: "The owner of the Homebrew installation.",
@@ -52,7 +52,7 @@ class Chef
       action :tap, description: "Add a Homebrew tap." do
         unless tapped?(new_resource.tap_name)
           converge_by("tap #{new_resource.tap_name}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} tap #{new_resource.tap_name} #{new_resource.url || ""}",
+            shell_out!("#{new_resource.homebrew_path} tap #{new_resource.tap_name} #{new_resource.url || ""}",
               user: new_resource.owner,
               env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
               cwd: ::Dir.home(new_resource.owner))
@@ -63,7 +63,7 @@ class Chef
       action :untap, description: "Remove a Homebrew tap." do
         if tapped?(new_resource.tap_name)
           converge_by("untap #{new_resource.tap_name}") do
-            shell_out!("#{homebrew_bin_path(new_resource.homebrew_path)} untap #{new_resource.tap_name}",
+            shell_out!("#{new_resource.homebrew_path} untap #{new_resource.tap_name}",
               user: new_resource.owner,
               env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
               cwd: ::Dir.home(new_resource.owner))
@@ -75,9 +75,8 @@ class Chef
       #
       # @return [Boolean]
       def tapped?(name)
-        base_path = ["#{::File.dirname(which("brew"))}/../homebrew", "#{::File.dirname(which("brew"))}/../Homebrew", "/opt/homebrew", "/usr/local/Homebrew", "/home/linuxbrew/.linuxbrew"].uniq.select { |x| Dir.exist?(x) }.first
         tap_dir = name.gsub("/", "/homebrew-")
-        ::File.directory?("#{base_path}/Library/Taps/#{tap_dir}")
+        ::File.directory?("/usr/local/Homebrew/Library/Taps/#{tap_dir}")
       end
     end
   end

data/lib/chef/resource/homebrew_update.rb

@@ -27,8 +27,6 @@ class Chef
     class HomebrewUpdate < Chef::Resource
       include Chef::Mixin::HomebrewUser
 
-      unified_mode true
-
       provides(:homebrew_update) { true }
 
       description "Use the **homebrew_update** resource to manage Homebrew repository updates on macOS."

data/lib/chef/resource/hostname.rb

@@ -23,7 +23,6 @@ class Chef
     # Sets the hostname and updates /etc/hosts on *nix systems
     # @since 14.0.0
     class Hostname < Chef::Resource
-      unified_mode true
 
       provides :hostname
 

data/lib/chef/resource/http_request.rb

@@ -22,7 +22,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class HttpRequest < Chef::Resource
-      unified_mode true
 
       provides :http_request
 

data/lib/chef/resource/ifconfig.rb

@@ -22,7 +22,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class Ifconfig < Chef::Resource
-      unified_mode true
 
       provides :ifconfig
 

data/lib/chef/resource/inspec_input.rb

@@ -20,7 +20,6 @@ class Chef
   class Resource
     class InspecInput < Chef::Resource
       provides :inspec_input
-      unified_mode true
 
       description "Use the **inspec_input** resource to add an input to the Compliance Phase."
       introduced "17.5"

data/lib/chef/resource/inspec_waiver.rb

@@ -20,7 +20,6 @@ class Chef
   class Resource
     class InspecWaiver < Chef::Resource
       provides :inspec_waiver
-      unified_mode true
 
       description "Use the **inspec_waiver** resource to add a waiver to the Compliance Phase."
       introduced "17.5"

data/lib/chef/resource/inspec_waiver_file_entry.rb

@@ -24,7 +24,6 @@ class Chef
   class Resource
     class InspecWaiverFileEntry < Chef::Resource
       provides :inspec_waiver_file_entry
-      unified_mode true
 
       description "Use the **inspec_waiver_file_entry** resource to add or remove entries from an InSpec waiver file. This can be used in conjunction with the Compliance Phase."
       introduced "17.1"
@@ -137,11 +136,11 @@ class Chef
         def load_waiver_file_to_hash(file_name)
           if %r{(/|C:\\).*(.yaml|.yml)}i.match?(file_name)
             if ::File.exist?(file_name)
-              hash = ::YAML.load_file(file_name)
+              hash = ::YAML.safe_load_file(file_name, permitted_classes: [Date])
               if hash == false || hash.nil? || hash == ""
                 {}
               else
-                ::YAML.load_file(file_name)
+                ::YAML.safe_load_file(file_name, permitted_classes: [Date])
               end
             else
               {}

data/lib/chef/resource/ips_package.rb

@@ -22,7 +22,6 @@ require_relative "../provider/package/ips"
 class Chef
   class Resource
     class IpsPackage < ::Chef::Resource::Package
-      unified_mode true
 
       provides :ips_package
       provides :package, os: "solaris2"

data/lib/chef/resource/kernel_module.rb

@@ -11,7 +11,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class KernelModule < Chef::Resource
-      unified_mode true
 
       provides :kernel_module
 

data/lib/chef/resource/ksh.rb

@@ -21,7 +21,6 @@ require_relative "script"
 class Chef
   class Resource
     class Ksh < Chef::Resource::Script
-      unified_mode true
 
       provides :ksh
 

data/lib/chef/resource/launchd.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class Launchd < Chef::Resource
-      unified_mode true
       provides :launchd
 
       description "Use the **launchd** resource to manage system-wide services (daemons) and per-user services (agents) on the macOS platform."

data/lib/chef/resource/link.rb

@@ -24,7 +24,6 @@ class Chef
   class Resource
     class Link < Chef::Resource
       include Chef::Mixin::Securable
-      unified_mode true
 
       provides :link
 

data/lib/chef/resource/locale.rb

@@ -21,7 +21,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class Locale < Chef::Resource
-      unified_mode true
       provides :locale
 
       description "Use the **locale** resource to set the system's locale on Debian and Windows systems. Windows support was added in Chef Infra Client 16.0"
@@ -113,11 +112,8 @@ class Chef
           end
 
           requirements.assert(:all_actions) do |a|
-            a.assertion do
-              # RHEL/CentOS type platforms don't have locale-gen
-              # Windows has locale-gen as part of the install, but not in the path
-              which("locale-gen") || windows?
-            end
+            # RHEL/CentOS type platforms don't have locale-gen
+            a.assertion { which("locale-gen") }
             a.failure_message(Chef::Exceptions::ProviderNotFound, "The locale resource requires the locale-gen tool")
           end
         end

data/lib/chef/resource/log.rb

@@ -29,7 +29,6 @@ class Chef
     #     level :debug
     #   end
     class Log < Chef::Resource
-      unified_mode true
 
       provides :log, target_mode: true
 

data/lib/chef/resource/lwrp_base.rb

@@ -54,10 +54,6 @@ class Chef
           resource_class.run_context = run_context
           resource_class.class_from_file(filename)
 
-          if !resource_class.unified_mode && !deprecated_class(resource_class) && cookbook_name.to_s != "chef_client_updater"
-            Chef.deprecated :unified_mode, "The #{resource_class.resource_name} resource in the #{cookbook_name} cookbook should declare `unified_mode true`", filename
-          end
-
           # Make a useful string for the class (rather than <Class:312894723894>)
           resource_class.instance_eval do
             define_singleton_method(:to_s) do

data/lib/chef/resource/macos_userdefaults.rb

@@ -23,7 +23,6 @@ autoload :Plist, "plist"
 class Chef
   class Resource
     class MacosUserDefaults < Chef::Resource
-      unified_mode true
 
       # align with apple's marketing department
       provides(:macos_userdefaults) { true }
@@ -51,17 +50,15 @@ class Chef
         end
         ```
 
-        **Setting a value for specific user and hosts**
+        **Specifying the type of a key to skip automatic type detection**
 
         ```ruby
-        macos_userdefaults 'Enable macOS firewall' do
-          key 'globalstate'
-          value 1
-          user 'jane'
-          host :current
+        macos_userdefaults 'Finder expanded save dialogs' do
+          key 'NSNavPanelExpandedStateForSaveMode'
+          value 'TRUE'
+          type 'bool'
         end
         ```
-
       DOC
 
       property :domain, String,
@@ -82,7 +79,6 @@ class Chef
 
       property :host, [String, Symbol],
         description: "Set either :current, :all or a hostname to set the user default at the host level.",
-        default: :all,
         desired_state: false,
         introduced: "16.3"
 
@@ -98,7 +94,6 @@ class Chef
 
       property :user, [String, Symbol],
         description: "The system user that the default will be applied to. Set :current for current user, :all for all users or pass a valid username",
-        default: :current,
         desired_state: false
 
       property :sudo, [TrueClass, FalseClass],

data/lib/chef/resource/macosx_service.rb

@@ -21,7 +21,6 @@ require_relative "service"
 class Chef
   class Resource
     class MacosxService < Chef::Resource::Service
-      unified_mode true
 
       provides :macosx_service
       provides :service, os: "darwin"

data/lib/chef/resource/macports_package.rb

@@ -21,7 +21,6 @@ require_relative "package"
 class Chef
   class Resource
     class MacportsPackage < Chef::Resource::Package
-      unified_mode true
       provides :macports_package
 
       description "Use the **macports_package** resource to manage packages for the macOS platform using the MacPorts package management system."

data/lib/chef/resource/mdadm.rb

@@ -22,7 +22,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class Mdadm < Chef::Resource
-      unified_mode true
 
       provides :mdadm
 

data/lib/chef/resource/mount.rb

@@ -23,7 +23,6 @@ class Chef
   class Resource
     class Mount < Chef::Resource
       description "Use the **mount** resource to manage a mounted file system."
-      unified_mode true
 
       provides :mount
 

data/lib/chef/resource/msu_package.rb

@@ -23,7 +23,6 @@ class Chef
   class Resource
     class MsuPackage < Chef::Resource::Package
       include Chef::Mixin::Uris
-      unified_mode true
 
       provides :msu_package
 

data/lib/chef/resource/notify_group.rb

@@ -21,8 +21,6 @@ class Chef
     class NotifyGroup < Chef::Resource
       provides :notify_group
 
-      unified_mode true
-
       description "The notify_group resource does nothing, and always fires notifications which are set on it.  Use it to DRY blocks of notifications that are common to multiple resources, and provide a single target for other resources to notify.  Unlike most resources, its default action is :nothing."
       introduced "15.8"
       examples <<~DOC

data/lib/chef/resource/ohai.rb

@@ -25,7 +25,6 @@ require "ohai" unless defined?(Ohai::System)
 class Chef
   class Resource
     class Ohai < Chef::Resource
-      unified_mode true
 
       provides :ohai
 

data/lib/chef/resource/ohai_hint.rb

@@ -20,7 +20,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class OhaiHint < Chef::Resource
-      unified_mode true
 
       provides(:ohai_hint) { true }
 

data/lib/chef/resource/openbsd_package.rb

@@ -25,7 +25,6 @@ require_relative "../provider/package/openbsd"
 class Chef
   class Resource
     class OpenbsdPackage < Chef::Resource::Package
-      unified_mode true
       provides :openbsd_package
       provides :package, os: "openbsd"
 

data/lib/chef/resource/openssl_dhparam.rb

@@ -23,8 +23,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides(:openssl_dhparam) { true }
 
       description "Use the **openssl_dhparam** resource to generate `dhparam.pem` files. If a valid `dhparam.pem` file is found at the specified location, no new file will be created. If a file is found at the specified location but it is not a valid `dhparam.pem` file, it will be overwritten."

data/lib/chef/resource/openssl_ec_private_key.rb

@@ -24,8 +24,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides :openssl_ec_private_key
 
       description "Use the **openssl_ec_private_key** resource to generate an elliptic curve (EC) private key file. If a valid EC key file can be opened at the specified location, no new file will be created. If the EC key file cannot be opened, either because it does not exist or because the password to the EC key file does not match the password in the recipe, then it will be overwritten."

data/lib/chef/resource/openssl_ec_public_key.rb

@@ -24,8 +24,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides :openssl_ec_public_key
 
       description "Use the **openssl_ec_public_key** resource to generate elliptic curve (EC) public key files from a given EC private key."

data/lib/chef/resource/openssl_rsa_private_key.rb

@@ -23,8 +23,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides(:openssl_rsa_private_key) { true }
       provides(:openssl_rsa_key) { true } # legacy cookbook resource name
 

data/lib/chef/resource/openssl_rsa_public_key.rb

@@ -23,8 +23,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides(:openssl_rsa_public_key) { true }
 
       examples <<~DOC

data/lib/chef/resource/openssl_x509_certificate.rb

@@ -24,8 +24,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides :openssl_x509_certificate
       provides(:openssl_x509) { true } # legacy cookbook name.
 

data/lib/chef/resource/openssl_x509_crl.rb

@@ -24,8 +24,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides :openssl_x509_crl
 
       description "Use the **openssl_x509_crl** resource to generate PEM-formatted x509 certificate revocation list (CRL) files."

data/lib/chef/resource/openssl_x509_request.rb

@@ -24,8 +24,6 @@ class Chef
       require_relative "../mixin/openssl_helper"
       include Chef::Mixin::OpenSSLHelper
 
-      unified_mode true
-
       provides :openssl_x509_request
 
       description "Use the **openssl_x509_request** resource to generate PEM-formatted x509 certificates requests. If no existing key is specified, the resource will automatically generate a passwordless key with the certificate."

data/lib/chef/resource/osx_profile.rb

@@ -25,7 +25,6 @@ autoload :Plist, "plist"
 class Chef
   class Resource
     class OsxProfile < Chef::Resource
-      unified_mode true
 
       provides :osx_profile
       provides :osx_config_profile

data/lib/chef/resource/package.rb

@@ -22,7 +22,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class Package < Chef::Resource
-      unified_mode true
       provides :package
 
       description "Use the **package** resource to manage packages. When the package is"\

data/lib/chef/resource/pacman_package.rb

@@ -21,7 +21,6 @@ require_relative "package"
 class Chef
   class Resource
     class PacmanPackage < Chef::Resource::Package
-      unified_mode true
 
       provides :pacman_package
 

data/lib/chef/resource/paludis_package.rb

@@ -22,7 +22,6 @@ require_relative "../provider/package/paludis"
 class Chef
   class Resource
     class PaludisPackage < Chef::Resource::Package
-      unified_mode true
 
       provides :paludis_package
 

data/lib/chef/resource/perl.rb

@@ -21,7 +21,6 @@ require_relative "script"
 class Chef
   class Resource
     class Perl < Chef::Resource::Script
-      unified_mode true
 
       provides :perl
 

data/lib/chef/resource/plist.rb

@@ -22,7 +22,6 @@ class Chef
   class Resource
 
     class PlistResource < Chef::Resource # we name this PlistResource to avoid confusion with Plist from the plist gem
-      unified_mode true
 
       provides :plist
 
@@ -85,7 +84,7 @@ class Chef
         converge_if_changed :path do
           converge_by "create new plist: '#{new_resource.path}'" do
             file new_resource.path do
-              content {}.to_plist
+              content({}.to_plist)
               owner new_resource.owner
               group new_resource.group
               mode new_resource.mode if property_is_set?(:mode)
@@ -189,7 +188,12 @@ class Chef
         sep = " "
         arg = case subcommand.to_s
               when "add"
-                type_to_commandline_string(value)
+                if value.is_a?(Hash)
+                  sep = ":"
+                  value.map { |k, v| "#{k} #{type_to_commandline_string(v)}" }
+                else
+                  type_to_commandline_string(value)
+                end
               when "set"
                 if value.is_a?(Hash)
                   sep = ":"

data/lib/chef/resource/portage_package.rb

@@ -21,7 +21,6 @@ require_relative "package"
 class Chef
   class Resource
     class PortagePackage < Chef::Resource::Package
-      unified_mode true
 
       provides :portage_package
 

data/lib/chef/resource/powershell_package.rb

@@ -20,7 +20,6 @@ require_relative "package"
 class Chef
   class Resource
     class PowershellPackage < Chef::Resource::Package
-      unified_mode true
 
       provides :powershell_package
 

data/lib/chef/resource/powershell_package_source.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class PowershellPackageSource < Chef::Resource
-      unified_mode true
 
       provides :powershell_package_source
 

data/lib/chef/resource/powershell_script.rb

@@ -20,7 +20,6 @@ require_relative "windows_script"
 class Chef
   class Resource
     class PowershellScript < Chef::Resource::WindowsScript
-      unified_mode true
 
       set_guard_inherited_attributes(:interpreter)
 

data/lib/chef/resource/python.rb

@@ -20,7 +20,6 @@ require_relative "script"
 class Chef
   class Resource
     class Python < Chef::Resource::Script
-      unified_mode true
 
       provides :python