chef 17.10.95 → 18.0.169

data/lib/chef/resource/apt_preference.rb

@@ -21,7 +21,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class AptPreference < Chef::Resource
-      unified_mode true
 
       provides(:apt_preference) { true }
 

data/lib/chef/resource/apt_repository.rb

@@ -26,7 +26,6 @@ end
 class Chef
   class Resource
     class AptRepository < Chef::Resource
-      unified_mode true
 
       provides(:apt_repository) { true }
 

data/lib/chef/resource/apt_update.rb

@@ -22,7 +22,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class AptUpdate < Chef::Resource
-      unified_mode true
 
       provides(:apt_update) { true }
 

data/lib/chef/resource/archive_file.rb

@@ -30,7 +30,6 @@ end
 class Chef
   class Resource
     class ArchiveFile < Chef::Resource
-      unified_mode true
 
       provides :archive_file
       provides :libarchive_file # legacy cookbook name

data/lib/chef/resource/bash.rb

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

data/lib/chef/resource/batch.rb

@@ -21,7 +21,6 @@ require_relative "windows_script"
 class Chef
   class Resource
     class Batch < Chef::Resource::WindowsScript
-      unified_mode true
 
       provides :batch
 

data/lib/chef/resource/bff_package.rb

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

data/lib/chef/resource/breakpoint.rb

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

data/lib/chef/resource/build_essential.rb

@@ -19,7 +19,6 @@ require_relative "../resource"
 class Chef
   class Resource
     class BuildEssential < Chef::Resource
-      unified_mode true
 
       provides(:build_essential) { true }
 

data/lib/chef/resource/cab_package.rb

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

data/lib/chef/resource/chef_client_config.rb

@@ -20,7 +20,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class ChefClientConfig < Chef::Resource
-      unified_mode true
 
       provides :chef_client_config
 
@@ -253,21 +252,20 @@ class Chef
         description: "The data collector token to interact with the data collector server URL (Automate). Note: If possible, use Chef Infra Server to do all data collection reporting, as this removes the need to distribute tokens to individual nodes.",
         introduced: "17.8"
 
-      action :create, description: "Create a client.rb config file for configuring #{ChefUtils::Dist::Infra::PRODUCT}." do
-        unless ::Dir.exist?(new_resource.config_directory)
-          directory new_resource.config_directory do
+      action :create, description: "Create a client.rb config file and folders for configuring #{ChefUtils::Dist::Infra::PRODUCT}." do
+        [
+          new_resource.config_directory,
+          (::File.dirname(new_resource.log_location) unless new_resource.log_location.nil?),
+          new_resource.file_backup_path,
+          new_resource.file_cache_path,
+          ::File.join(new_resource.config_directory, "client.d"),
+          (::File.dirname(new_resource.pid_file) unless new_resource.pid_file.nil?),
+        ].compact.each do |dir_path|
+
+          directory dir_path do
             user new_resource.user unless new_resource.user.nil?
             group new_resource.group unless new_resource.group.nil?
-            mode "0750"
-            recursive true
-          end
-        end
-
-        unless ::Dir.exist?(::File.join(new_resource.config_directory, "client.d"))
-          directory ::File.join(new_resource.config_directory, "client.d") do
-            user new_resource.user unless new_resource.user.nil?
-            group new_resource.group unless new_resource.group.nil?
-            mode "0750"
+            mode dir_path == ::File.dirname(new_resource.log_location) ? "0755" : "0750"
             recursive true
           end
         end

data/lib/chef/resource/chef_client_cron.rb

@@ -22,7 +22,6 @@ require "digest/md5" unless defined?(Digest::MD5)
 class Chef
   class Resource
     class ChefClientCron < Chef::Resource
-      unified_mode true
 
       provides :chef_client_cron
 
@@ -99,7 +98,7 @@ class Chef
       property :splay, [Integer, String],
         default: 300,
         coerce: proc { |x| Integer(x) },
-        callbacks: { "should be a positive number" => proc { |v| v > 0 } },
+        callbacks: { "should be a positive number" => proc { |v| v >= 0 } },
         description: "A random number of seconds between 0 and X to add to interval so that all #{ChefUtils::Dist::Infra::CLIENT} commands don't execute at the same time."
 
       property :mailto, String,

data/lib/chef/resource/chef_client_launchd.rb

@@ -19,7 +19,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class ChefClientLaunchd < Chef::Resource
-      unified_mode true
 
       provides :chef_client_launchd
 
@@ -61,7 +60,7 @@ class Chef
       property :splay, [Integer, String],
         default: 300,
         coerce: proc { |x| Integer(x) },
-        callbacks: { "should be a positive number" => proc { |v| v > 0 } },
+        callbacks: { "should be a positive number" => proc { |v| v >= 0 } },
         description: "A random number of seconds between 0 and X to add to interval so that all #{ChefUtils::Dist::Infra::CLIENT} commands don't execute at the same time."
 
       property :accept_chef_license, [true, false],
@@ -135,6 +134,7 @@ class Chef
           program_arguments ["/bin/bash",
                              "-c",
                              "echo; echo #{ChefUtils::Dist::Infra::PRODUCT} launchd daemon config has been updated. Manually unloading and reloading the daemon; echo Now unloading the daemon; sudo /bin/launchctl unload /Library/LaunchDaemons/com.#{ChefUtils::Dist::Infra::SHORT}.#{ChefUtils::Dist::Infra::CLIENT}.plist; sleep 2; echo Now loading the daemon; sudo /bin/launchctl load /Library/LaunchDaemons/com.#{ChefUtils::Dist::Infra::SHORT}.#{ChefUtils::Dist::Infra::CLIENT}.plist"]
+          run_at_load true
           action :enable # enable creates the plist & triggers service restarts on change
         end
 

data/lib/chef/resource/chef_client_scheduled_task.rb

@@ -20,7 +20,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class ChefClientScheduledTask < Chef::Resource
-      unified_mode true
 
       provides :chef_client_scheduled_task
 
@@ -108,7 +107,7 @@ class Chef
 
       property :splay, [Integer, String],
         coerce: proc { |x| Integer(x) },
-        callbacks: { "should be a positive number" => proc { |v| v > 0 } },
+        callbacks: { "should be a positive number" => proc { |v| v >= 0 } },
         description: "A random number of seconds between 0 and X to add to interval so that all #{ChefUtils::Dist::Infra::CLIENT} commands don't execute at the same time.",
         default: 300
 
@@ -123,7 +122,8 @@ class Chef
 
       property :config_directory, String,
         description: "The path of the config directory.",
-        default: ChefConfig::Config.etc_chef_dir
+        default: ChefConfig::Config.etc_chef_dir,
+        default_description: ChefConfig::Config.c_chef_dir
 
       property :log_directory, String,
         description: "The path of the directory to create the log file in.",

data/lib/chef/resource/chef_client_systemd_timer.rb

@@ -20,7 +20,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class ChefClientSystemdTimer < Chef::Resource
-      unified_mode true
 
       provides :chef_client_systemd_timer
 

data/lib/chef/resource/chef_client_trusted_certificate.rb

@@ -20,7 +20,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class ChefClientTrustedCertificate < Chef::Resource
-      unified_mode true
 
       provides :chef_client_trusted_certificate
 

data/lib/chef/resource/chef_gem.rb

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

data/lib/chef/resource/chef_handler.rb

@@ -21,7 +21,6 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 class Chef
   class Resource
     class ChefHandler < Chef::Resource
-      unified_mode true
 
       provides(:chef_handler) { true }
 

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 }
 

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"