chef 17.10.163 → 18.0.169

data/lib/chef/resource/chef_sleep.rb

@@ -22,8 +22,6 @@ class Chef
     class ChefSleep < Chef::Resource
       provides :chef_sleep
 
-      unified_mode true
-
       description "Use the **chef_sleep** resource to pause (sleep) for a number of seconds during a #{ChefUtils::Dist::Infra::PRODUCT} run. Only use this resource when a command or service exits successfully but is not ready for the next step in a recipe."
       introduced "15.5"
       examples <<~DOC
@@ -47,7 +45,7 @@ class Chef
         service 'Service that is slow to start and reports as started' do
           service_name 'my_database'
           action :start
-          notifies :sleep, chef_sleep['wait for service start']
+          notifies :sleep, 'chef_sleep[wait for service start]'
         end
 
         chef_sleep 'wait for service start' do

data/lib/chef/resource/chef_vault_secret.rb

@@ -21,7 +21,6 @@ autoload :ChefVault, "chef-vault"
 class Chef
   class Resource
     class ChefVaultSecret < Chef::Resource
-      unified_mode true
 
       provides :chef_vault_secret
 

data/lib/chef/resource/chocolatey_config.rb

@@ -17,7 +17,6 @@
 class Chef
   class Resource
     class ChocolateyConfig < Chef::Resource
-      unified_mode true
 
       provides :chocolatey_config
 

data/lib/chef/resource/chocolatey_feature.rb

@@ -17,7 +17,6 @@
 class Chef
   class Resource
     class ChocolateyFeature < Chef::Resource
-      unified_mode true
       provides :chocolatey_feature
 
       description "Use the **chocolatey_feature** resource to enable and disable Chocolatey features. Note: The Chocolatey package manager is not installed on Windows by default. You will need to install it prior to using this resource by adding the [Chocolatey cookbook](https://supermarket.chef.io/cookbooks/chocolatey/) to your node's run list."

data/lib/chef/resource/chocolatey_package.rb

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

data/lib/chef/resource/chocolatey_source.rb

@@ -17,7 +17,6 @@
 class Chef
   class Resource
     class ChocolateySource < Chef::Resource
-      unified_mode true
       provides :chocolatey_source
 
       description "Use the **chocolatey_source** resource to add, remove, enable, or disable Chocolatey sources. Note: The Chocolatey package manager is not installed on Windows by default. You will need to install it prior to using this resource by adding the [Chocolatey cookbook](https://supermarket.chef.io/cookbooks/chocolatey/) to your node's run list."

data/lib/chef/resource/cookbook_file.rb

@@ -27,7 +27,6 @@ class Chef
   class Resource
     class CookbookFile < Chef::Resource::File
       include Chef::Mixin::Securable
-      unified_mode true
 
       provides :cookbook_file
 

data/lib/chef/resource/cron/_cron_shared.rb

@@ -1,4 +1,3 @@
-unified_mode true
 
 TIMEOUT_OPTS = %w{duration preserve-status foreground kill-after signal}.freeze
 TIMEOUT_REGEX = /\A\S+/.freeze

data/lib/chef/resource/cron/cron.rb

@@ -25,7 +25,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class Cron < Chef::Resource
-      unified_mode true
 
       use "cron_shared"
 

data/lib/chef/resource/cron/cron_d.rb

@@ -23,7 +23,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class CronD < Chef::Resource
-      unified_mode true
 
       use "cron_shared"
 
@@ -146,6 +145,21 @@ class Chef
           new_resource.cron_name.tr(".", "-")
         end
 
+        def define_resource_requirements
+          requirements.assert(:create, :create_if_missing) do |a|
+            a.assertion do
+              # ensure valid cron job names for linux, otherwise the jobs won't be executed
+              if linux?
+                new_resource.cron_name =~ /^[a-zA-Z0-9_-]+$/
+              else
+                true
+              end
+            end
+            a.failure_message("The cron job name should contain letters, numbers, hyphens and underscores only.")
+            a.block_action!
+          end
+        end
+
         def create_template(create_action)
           # cleanup the legacy named job if it exists
           file "#{new_resource.cron_name} legacy named cron.d file" do

data/lib/chef/resource/cron_access.rb

@@ -23,7 +23,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class CronAccess < Chef::Resource
-      unified_mode true
       provides :cron_access
       provides(:cron_manage) # legacy name @todo in Chef 15 we should { true } this so it wins over the cookbook
 

data/lib/chef/resource/csh.rb

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

data/lib/chef/resource/directory.rb

@@ -24,7 +24,6 @@ require_relative "../mixin/securable"
 class Chef
   class Resource
     class Directory < Chef::Resource
-      unified_mode true
 
       provides :directory
 

data/lib/chef/resource/dmg_package.rb

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

data/lib/chef/resource/dnf_package.rb

@@ -26,7 +26,6 @@ class Chef
       extend Chef::Mixin::Which
       extend Chef::Mixin::ShellOut
 
-      unified_mode true
       provides :dnf_package
 
       # all rhel variants >= 8 will use DNF

data/lib/chef/resource/dpkg_package.rb

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

data/lib/chef/resource/dsc_resource.rb

@@ -20,7 +20,6 @@ require_relative "../dsl/powershell"
 class Chef
   class Resource
     class DscResource < Chef::Resource
-      unified_mode true
 
       provides :dsc_resource
 

data/lib/chef/resource/dsc_script.rb

@@ -26,7 +26,6 @@ class Chef
     class DscScript < Chef::Resource
       include Chef::DSL::Powershell
 
-      unified_mode true
       provides :dsc_script
 
       description <<~DESC

data/lib/chef/resource/execute.rb

@@ -23,7 +23,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class Execute < Chef::Resource
-      unified_mode true
 
       provides :execute, target_mode: true
 

data/lib/chef/resource/file.rb

@@ -28,7 +28,6 @@ class Chef
   class Resource
     class File < Chef::Resource
       include Chef::Mixin::Securable
-      unified_mode true
 
       provides :file
 

data/lib/chef/resource/freebsd_package.rb

@@ -25,7 +25,6 @@ require_relative "../provider/package/freebsd/pkgng"
 class Chef
   class Resource
     class FreebsdPackage < Chef::Resource::Package
-      unified_mode true
       provides :freebsd_package
       provides :package, platform: "freebsd"
 

data/lib/chef/resource/gem_package.rb

@@ -22,7 +22,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class GemPackage < Chef::Resource::Package
-      unified_mode true
       provides :gem_package
 
       description <<~DESC

data/lib/chef/resource/group.rb

@@ -20,11 +20,34 @@
 class Chef
   class Resource
     class Group < Chef::Resource
-      unified_mode true
       state_attrs :members
 
       description "Use the **group** resource to manage a local group."
 
+      examples <<~EXAMPLES
+      The following examples demonstrate various approaches for using the **group** resource in recipes:
+
+      Append users to groups:
+
+      ```ruby
+      group 'www-data' do
+        action :modify
+        members 'maintenance'
+        append true
+      end
+      ```
+
+      Add a user to group on the Windows platform:
+
+      ```ruby
+      group 'Administrators' do
+        members ['domain\\foo']
+        append true
+        action :modify
+      end
+      ```
+      EXAMPLES
+
       provides :group
 
       allowed_actions :create, :remove, :modify, :manage
@@ -39,7 +62,7 @@ class Chef
 
       property :members, [String, Array], default: [],
                coerce: proc { |arg| arg.is_a?(String) ? arg.split(/\s*,\s*/) : arg },
-               description: "Which users should be set or appended to a group. When more than one group member is identified, the list of members should be an array: members ['user1', 'user2']."
+               description: "Which users should be set or appended to a group. When more than one group member is identified, the list of members should be an array: `members ['user1', 'user2']`."
 
       property :excluded_members, [String, Array], default: [],
                coerce: proc { |arg| arg.is_a?(String) ? arg.split(/\s*,\s*/) : arg },

data/lib/chef/resource/habitat/habitat_package.rb

@@ -21,7 +21,6 @@ require_relative "../package"
 class Chef
   class Resource
     class HabitatPackage < Chef::Resource::Package
-      unified_mode true
 
       provides :habitat_package
       use "habitat_shared"

data/lib/chef/resource/habitat/habitat_sup.rb

@@ -20,7 +20,6 @@ require_relative "../../resource"
 class Chef
   class Resource
     class HabitatSup < Chef::Resource
-      unified_mode true
 
       provides :habitat_sup do |_node|
         false
@@ -49,7 +48,7 @@ class Chef
 
       ```ruby
       habitat_sup 'default' do
-        bldr_url 'https://bldr.private.net'
+        bldr_url 'https://bldr.example.com'
       end
       ```
 
@@ -57,13 +56,13 @@ class Chef
 
       ```ruby
       habitat_sup 'default' do
-        bldr_url 'https://bldr.private.net'
+        bldr_url 'https://bldr.example.com'
         habitat_channel 'dev'
         update_condition 'track-channel'
       end
       ```
 
-      **Provide event_stream_* information**
+      **Provide event stream information**
 
       ```ruby
       habitat_sup 'default' do
@@ -71,7 +70,7 @@ class Chef
         event_stream_application 'myapp'
         event_stream_environment 'production'
         event_stream_site 'MySite'
-        event_stream_url 'automate.private.net:4222'
+        event_stream_url 'automate.example.com:4222'
         event_stream_token 'myawesomea2clitoken='
         event_stream_cert '/hab/cache/ssl/mycert.crt'
       end
@@ -81,7 +80,7 @@ class Chef
 
       ```ruby
       habitat_sup 'default' do
-        bldr_url 'https://bldr.private.net'
+        bldr_url 'https://bldr.example.com'
         sup_version '1.5.50'
         launcher_version '13458'
         service_version '0.6.0' # WINDOWS ONLY
@@ -91,7 +90,7 @@ class Chef
       **Set latest version of packages to retain**
 
       habitat_sup 'default' do
-        bldr_url 'https://bldr.private.net'
+        bldr_url 'https://bldr.example.com'
         sup_version '1.5.86'
         launcher_version '13458'
         service_version '0.6.0' # WINDOWS ONLY

data/lib/chef/resource/habitat/habitat_sup_windows.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "win32/service" if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
+require "win32/service" if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
 require_relative "habitat_sup"
 
 class Chef

data/lib/chef/resource/habitat_config.rb

@@ -20,7 +20,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class HabitatConfig < Chef::Resource
-      unified_mode true
 
       provides :habitat_config
 

data/lib/chef/resource/habitat_install.rb

@@ -19,7 +19,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class HabitatInstall < Chef::Resource
-      unified_mode true
       provides :habitat_install
 
       description "Use the **habitat_install** resource to install Chef Habitat."

data/lib/chef/resource/habitat_service.rb

@@ -20,7 +20,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class HabitatService < Chef::Resource
-      unified_mode true
       provides :habitat_service
 
       description "Use the **habitat_service** resource to manage Chef Habitat services. This requires that `core/hab-sup` be running as a service. See the `habitat_sup` resource documentation for more information. Note: Applications may run as a specific user. Often with Habitat, the default is `hab`, or `root`. If the application requires another user, then it should be created with Chef's `user` resource."

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