chef 15.17.4 → 16.0.257

data/lib/chef/resource/chocolatey_config.rb

@@ -17,7 +17,9 @@
 class Chef
   class Resource
     class ChocolateyConfig < Chef::Resource
-      resource_name :chocolatey_config
+      unified_mode true
+
+      provides :chocolatey_config
 
       description "Use the chocolatey_config resource to add or remove Chocolatey configuration keys."
       introduced "14.3"

data/lib/chef/resource/chocolatey_feature.rb

@@ -17,7 +17,8 @@
 class Chef
   class Resource
     class ChocolateyFeature < Chef::Resource
-      resource_name :chocolatey_feature
+      unified_mode true
+      provides :chocolatey_feature
 
       description "Use the chocolatey_feature resource to enable and disable Chocolatey features."
       introduced "15.1"

data/lib/chef/resource/chocolatey_package.rb

@@ -21,7 +21,8 @@ require_relative "package"
 class Chef
   class Resource
     class ChocolateyPackage < Chef::Resource::Package
-      resource_name :chocolatey_package
+      unified_mode true
+
       provides :chocolatey_package
 
       description "Use the chocolatey_package resource to manage packages using Chocolatey on the Microsoft Windows platform."

data/lib/chef/resource/chocolatey_source.rb

@@ -17,7 +17,8 @@
 class Chef
   class Resource
     class ChocolateySource < Chef::Resource
-      resource_name :chocolatey_source
+      unified_mode true
+      provides :chocolatey_source
 
       description "Use the chocolatey_source resource to add, remove, enable, or disable Chocolatey sources."
       introduced "14.3"

data/lib/chef/resource/cookbook_file.rb

@@ -29,7 +29,7 @@ class Chef
       include Chef::Mixin::Securable
       unified_mode true
 
-      resource_name :cookbook_file
+      provides :cookbook_file
 
       description "Use the cookbook_file resource to transfer files from a sub-directory of COOKBOOK_NAME/files/ to a specified path located on a host that is running the #{Chef::Dist::PRODUCT}. The file is selected according to file specificity, which allows different source files to be used based on the hostname, host platform (operating system, distro, or as appropriate), or platform version. Files that are located in the COOKBOOK_NAME/files/default sub-directory may be used on any platform.\n\nDuring a #{Chef::Dist::PRODUCT} run, the checksum for each local file is calculated and then compared against the checksum for the same file as it currently exists in the cookbook on the #{Chef::Dist::SERVER_PRODUCT}. A file is not transferred when the checksums match. Only files that require an update are transferred from the #{Chef::Dist::SERVER_PRODUCT} to a node."
 

data/lib/chef/resource/cron.rb

@@ -18,12 +18,13 @@
 #
 
 require_relative "../resource"
+require_relative "helpers/cron_validations"
 require_relative "../provider/cron" # do not remove. we actually need this below
 
 class Chef
   class Resource
     class Cron < Chef::Resource
-      resource_name :cron
+      unified_mode true
       provides :cron
 
       description "Use the cron resource to manage cron entries for time-based job scheduling. Properties for a schedule will default to * if not provided. The cron resource requires access to a crontab program, typically cron."
@@ -35,80 +36,33 @@ class Chef
 
       def initialize(name, run_context = nil)
         super
-        @minute = "*"
-        @hour = "*"
-        @day = "*"
         @month = "*"
         @weekday = "*"
       end
 
-      def minute(arg = nil)
-        if arg.is_a?(Integer)
-          converted_arg = arg.to_s
-        else
-          converted_arg = arg
-        end
-        begin
-          if integerize(arg) > 59 then raise RangeError end
-        rescue ArgumentError
-        end
-        set_or_return(
-          :minute,
-          converted_arg,
-          kind_of: String
-        )
-      end
+      property :minute, [Integer, String],
+        description: "The minute at which the cron entry should run (0 - 59).",
+        default: "*", callbacks: {
+          "should be a valid minute spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_numeric(spec, 0, 59) },
+        }
 
-      def hour(arg = nil)
-        if arg.is_a?(Integer)
-          converted_arg = arg.to_s
-        else
-          converted_arg = arg
-        end
-        begin
-          if integerize(arg) > 23 then raise RangeError end
-        rescue ArgumentError
-        end
-        set_or_return(
-          :hour,
-          converted_arg,
-          kind_of: String
-        )
-      end
+      property :hour, [Integer, String],
+        description: "The hour at which the cron entry is to run (0 - 23).",
+        default: "*", callbacks: {
+          "should be a valid hour spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_numeric(spec, 0, 23) },
+        }
 
-      def day(arg = nil)
-        if arg.is_a?(Integer)
-          converted_arg = arg.to_s
-        else
-          converted_arg = arg
-        end
-        begin
-          if integerize(arg) > 31 then raise RangeError end
-        rescue ArgumentError
-        end
-        set_or_return(
-          :day,
-          converted_arg,
-          kind_of: String
-        )
-      end
+      property :day, [Integer, String],
+        description: "The day of month at which the cron entry should run (1 - 31).",
+        default: "*", callbacks: {
+          "should be a valid day spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_numeric(spec, 1, 31) },
+        }
 
-      def month(arg = nil)
-        if arg.is_a?(Integer)
-          converted_arg = arg.to_s
-        else
-          converted_arg = arg
-        end
-        begin
-          if integerize(arg) > 12 then raise RangeError end
-        rescue ArgumentError
-        end
-        set_or_return(
-          :month,
-          converted_arg,
-          kind_of: String
-        )
-      end
+      property :month, [Integer, String],
+        description: "The month in the year on which a cron entry is to run (1 - 12, jan-dec, or *).",
+        default: "*", callbacks: {
+          "should be a valid month spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_month(spec) },
+        }
 
       def weekday(arg = nil)
         if arg.is_a?(Integer)

data/lib/chef/resource/cron_access.rb

@@ -23,11 +23,12 @@ require_relative "../resource"
 class Chef
   class Resource
     class CronAccess < Chef::Resource
-      resource_name :cron_access
+      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
 
       introduced "14.4"
-      description "Use the **cron_access** resource to manage cron's cron.allow and cron.deny files. Note: This resource previously shipped in the `cron` cookbook as `cron_manage`, which it can still be used as for backwards compatibility with existing Chef Infra Client releases."
+      description "Use the cron_access resource to manage the /etc/cron.allow and /etc/cron.deny files."
       examples <<~DOC
         Add the mike user to cron.allow
         ```ruby
@@ -43,7 +44,7 @@ class Chef
 
         Specify the username with the user property
         ```ruby
-        cron_access 'Deny the tomcat access to cron for security purposes' do
+        cron_access 'Deny the jenkins user access to cron for security purposes' do
           user 'jenkins'
           action :deny
         end
@@ -54,19 +55,12 @@ class Chef
         description: "An optional property to set the user name if it differs from the resource block's name.",
         name_property: true
 
-      CRON_PATHS = {
-          "aix" => "/var/adm/cron",
-          "solaris" => "/etc/cron.d",
-          "default" => "/etc",
-      }.freeze
-
       action :allow do
         description "Add the user to the cron.allow file."
-        allow_path = ::File.join(value_for_platform_family(CRON_PATHS), "cron.allow")
 
         with_run_context :root do
-          edit_resource(:template, allow_path) do |new_resource|
-            source ::File.expand_path("support/cron_access.erb", __dir__)
+          edit_resource(:template, "/etc/cron.allow") do |new_resource|
+            source ::File.expand_path("../support/cron_access.erb", __FILE__)
             local true
             mode "0600"
             variables["users"] ||= []
@@ -79,11 +73,10 @@ class Chef
 
       action :deny do
         description "Add the user to the cron.deny file."
-        deny_path = ::File.join(value_for_platform_family(CRON_PATHS), "cron.deny")
 
         with_run_context :root do
-          edit_resource(:template, deny_path) do |new_resource|
-            source ::File.expand_path("support/cron_access.erb", __dir__)
+          edit_resource(:template, "/etc/cron.deny") do |new_resource|
+            source ::File.expand_path("../support/cron_access.erb", __FILE__)
             local true
             mode "0600"
             variables["users"] ||= []

data/lib/chef/resource/cron_d.rb

@@ -16,13 +16,15 @@
 #
 
 require_relative "../resource"
+require_relative "helpers/cron_validations"
 require "shellwords" unless defined?(Shellwords)
 require_relative "../dist"
 
 class Chef
   class Resource
     class CronD < Chef::Resource
-      resource_name :cron_d
+      unified_mode true
+      provides :cron_d
 
       introduced "14.4"
       description "Use the cron_d resource to manage cron definitions in /etc/cron.d. This is similar to the 'cron' resource, but it does not use the monolithic /etc/crontab file."
@@ -72,73 +74,6 @@ class Chef
         ```
       DOC
 
-      # validate a provided value is between two other provided values
-      # we also allow * as a valid input
-      # @param spec the value to validate
-      # @param min the lowest value allowed
-      # @param max the highest value allowed
-      # @return [Boolean] valid or not?
-      def self.validate_numeric(spec, min, max)
-        return true if spec == "*"
-
-        #  binding.pry
-        if spec.respond_to? :to_int
-          return false unless spec >= min && spec <= max
-
-          return true
-        end
-
-        # Lists of invidual values, ranges, and step values all share the validity range for type
-        spec.split(%r{\/|-|,}).each do |x|
-          next if x == "*"
-          return false unless x =~ /^\d+$/
-
-          x = x.to_i
-          return false unless x >= min && x <= max
-        end
-        true
-      end
-
-      # validate the provided month value to be jan - dec, 1 - 12, or *
-      # @param spec the value to validate
-      # @return [Boolean] valid or not?
-      def self.validate_month(spec)
-        return true if spec == "*"
-
-        if spec.respond_to? :to_int
-          validate_numeric(spec, 1, 12)
-        elsif spec.respond_to? :to_str
-          return true if spec == "*"
-          # Named abbreviations are permitted but not as part of a range or with stepping
-          return true if %w{jan feb mar apr may jun jul aug sep oct nov dec}.include? spec.downcase
-
-          # 1-12 are legal for months
-          validate_numeric(spec, 1, 12)
-        else
-          false
-        end
-      end
-
-      # validate the provided day of the week is sun-sat, 0-7, or *
-      # @param spec the value to validate
-      # @return [Boolean] valid or not?
-      def self.validate_dow(spec)
-        return true if spec == "*"
-
-        if spec.respond_to? :to_int
-          validate_numeric(spec, 0, 7)
-        elsif spec.respond_to? :to_str
-          return true if spec == "*"
-          # Named abbreviations are permitted but not as part of a range or with stepping
-          return true if %w{sun mon tue wed thu fri sat}.include? spec.downcase
-
-          # 0-7 are legal for days of week
-          validate_numeric(spec, 0, 7)
-        else
-          false
-        end
-      end
-
       property :cron_name, String,
         description: "An optional property to set the cron name if it differs from the resource block's name.",
         name_property: true
@@ -152,31 +87,31 @@ class Chef
       property :minute, [Integer, String],
         description: "The minute at which the cron entry should run (0 - 59).",
         default: "*", callbacks: {
-          "should be a valid minute spec" => ->(spec) { validate_numeric(spec, 0, 59) },
+          "should be a valid minute spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_numeric(spec, 0, 59) },
         }
 
       property :hour, [Integer, String],
         description: "The hour at which the cron entry is to run (0 - 23).",
         default: "*", callbacks: {
-          "should be a valid hour spec" => ->(spec) { validate_numeric(spec, 0, 23) },
+          "should be a valid hour spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_numeric(spec, 0, 23) },
         }
 
       property :day, [Integer, String],
         description: "The day of month at which the cron entry should run (1 - 31).",
         default: "*", callbacks: {
-          "should be a valid day spec" => ->(spec) { validate_numeric(spec, 1, 31) },
+          "should be a valid day spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_numeric(spec, 1, 31) },
         }
 
       property :month, [Integer, String],
         description: "The month in the year on which a cron entry is to run (1 - 12, jan-dec, or *).",
         default: "*", callbacks: {
-          "should be a valid month spec" => ->(spec) { validate_month(spec) },
+          "should be a valid month spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_month(spec) },
         }
 
       property :weekday, [Integer, String],
         description: "The day of the week on which this entry is to run (0-7, mon-sun, or *), where Sunday is both 0 and 7.",
         default: "*", callbacks: {
-          "should be a valid weekday spec" => ->(spec) { validate_dow(spec) },
+          "should be a valid weekday spec" => ->(spec) { Chef::ResourceHelpers::CronValidations.validate_dow(spec) },
         }
 
       property :command, String,
@@ -289,10 +224,9 @@ class Chef
 
           # @todo this is Chef 12 era cleanup. Someday we should remove it all
           template "/etc/cron.d/#{sanitized_name}" do
-            source ::File.expand_path("support/cron.d.erb", __dir__)
+            source ::File.expand_path("../support/cron.d.erb", __FILE__)
             local true
             mode new_resource.mode
-            sensitive new_resource.sensitive
             variables(
               name: sanitized_name,
               predefined_value: new_resource.predefined_value,

data/lib/chef/resource/csh.rb

@@ -24,6 +24,8 @@ class Chef
     class Csh < Chef::Resource::Script
       unified_mode true
 
+      provides :csh
+
       description "Use the csh resource to execute scripts using the csh interpreter."\
                   " This resource may also use any of the actions and properties that are"\
                   " available to the execute resource. Commands that are executed with this"\

data/lib/chef/resource/directory.rb

@@ -26,7 +26,7 @@ class Chef
     class Directory < Chef::Resource
       unified_mode true
 
-      resource_name :directory
+      provides :directory
 
       description "Use the directory resource to manage a directory, which is a hierarchy"\
                   " of folders that comprises all of the information stored on a computer."\
@@ -42,7 +42,7 @@ class Chef
       default_action :create
       allowed_actions :create, :delete
 
-      property :path, String, name_property: true, identity: true,
+      property :path, String, name_property: true,
                description: "The path to the directory. Using a fully qualified path is recommended, but is not always required."
 
       property :recursive, [ TrueClass, FalseClass ],

data/lib/chef/resource/dmg_package.rb

@@ -20,7 +20,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class DmgPackage < Chef::Resource
-      resource_name :dmg_package
+      unified_mode true
+
       provides(:dmg_package) { true }
 
       description "Use the dmg_package resource to install a package from a .dmg file. The resource will retrieve the dmg file from a remote URL, mount it using OS X's hdidutil, copy the application (.app directory) to the specified destination (/Applications), and detach the image using hdiutil. The dmg file will be stored in the Chef::Config[:file_cache_path]."
@@ -129,8 +130,8 @@ class Chef
             end
           end
 
-          ruby_block "attach #{dmg_file}" do
-            block do
+          unless dmg_attached?
+            converge_by "attach #{dmg_file}" do
               raise "This DMG package requires EULA acceptance. Add 'accept_eula true' to dmg_package resource to accept the EULA during installation." if software_license_agreement? && !new_resource.accept_eula
 
               attach_cmd = new_resource.accept_eula ? "yes | " : ""
@@ -138,7 +139,6 @@ class Chef
 
               shell_out!(attach_cmd, env: { "PAGER" => "true" })
             end
-            not_if { dmg_attached? }
           end
 
           case new_resource.type

data/lib/chef/resource/dnf_package.rb

@@ -26,7 +26,8 @@ class Chef
       extend Chef::Mixin::Which
       extend Chef::Mixin::ShellOut
 
-      resource_name :dnf_package
+      unified_mode true
+      provides :dnf_package
 
       # all rhel variants >= 8 will use DNF
       provides :package, platform_family: "rhel", platform_version: ">= 8"
@@ -39,8 +40,6 @@ class Chef
         which("dnf")
       end
 
-      provides :dnf_package
-
       description "Use the dnf_package resource to install, upgrade, and remove packages with DNF for Fedora and RHEL 8+. The dnf_package resource is able to resolve provides data for packages much like DNF can do when it is run from the command line. This allows a variety of options for installing packages, like minimum versions, virtual provides and library names."
       introduced "12.18"
 

data/lib/chef/resource/dpkg_package.rb

@@ -21,7 +21,8 @@ require_relative "package"
 class Chef
   class Resource
     class DpkgPackage < Chef::Resource::Package
-      resource_name :dpkg_package
+      unified_mode true
+
       provides :dpkg_package
 
       description "Use the dpkg_package resource to manage packages for the dpkg platform. When a package is installed from a local file, it must be added to the node using the remote_file or cookbook_file resources."