chef 15.17.4 → 16.0.257

data/lib/chef/resource/service.rb

@@ -27,11 +27,10 @@ class Chef
     class Service < Chef::Resource
       include ChefUtils::DSL::Service
       extend ChefUtils::DSL::Service
+      unified_mode true
 
       provides :service, target_mode: true
 
-      identity_attr :service_name
-
       description "Use the service resource to manage a service."
 
       default_action :nothing
@@ -45,7 +44,7 @@ class Chef
 
       property :service_name, String,
         description: "An optional property to set the service name if it differs from the resource block's name.",
-        name_property: true, identity: true
+        name_property: true
 
       # regex for match against ps -ef when !supports[:has_status] && status == nil
       property :pattern, String,
@@ -83,7 +82,7 @@ class Chef
       # specify overrides for the start_command, stop_command and
       # restart_command properties.
       property :init_command, String,
-        description: "The path to the init script that is associated with the service. Use init_command to prevent the need to specify overrides for the start_command, stop_command, and restart_command properties. When this property is not specified, the #{Chef::Dist::CLIENT} will use the default init command for the service provider being used.",
+        description: "The path to the init script that is associated with the service. Use init_command to prevent the need to specify overrides for the start_command, stop_command, and restart_command properties. When this property is not specified, the #{Chef::Dist::PRODUCT} will use the default init command for the service provider being used.",
         desired_state: false
 
       # if the service is enabled or not
@@ -115,10 +114,10 @@ class Chef
       property :priority, [ Integer, String, Hash ],
         description: "Debian platform only. The relative priority of the program for start and shutdown ordering. May be an integer or a Hash. An integer is used to define the start run levels; stop run levels are then 100-integer. A Hash is used to define values for specific run levels. For example, { 2 => [:start, 20], 3 => [:stop, 55] } will set a priority of twenty for run level two and a priority of fifty-five for run level three."
 
-      # timeout only applies to the windows service manager
       property :timeout, Integer,
-        description: "Microsoft Windows platform only. The amount of time (in seconds) to wait before timing out.",
-        desired_state: false
+      description: "The amount of time (in seconds) to wait before timing out.",
+      default: 900,
+      desired_state: false
 
       property :parameters, Hash,
         description: "Upstart only: A hash of parameters to pass to the service command for use in the service definition."

data/lib/chef/resource/smartos_package.rb

@@ -21,11 +21,19 @@ require_relative "package"
 class Chef
   class Resource
     class SmartosPackage < Chef::Resource::Package
-      resource_name :smartos_package
+      unified_mode true
+
       provides :smartos_package
       provides :package, platform_family: "smartos"
 
       description "Use the smartos_package resource to manage packages for the SmartOS platform."
+
+      property :package_name, String,
+        description: "An optional property to set the package name if it differs from the resource block's name.",
+        identity: true
+
+      property :version, String,
+        description: "The version of a package to be installed or upgraded."
     end
   end
 end

data/lib/chef/resource/snap_package.rb

@@ -21,7 +21,9 @@ require_relative "package"
 class Chef
   class Resource
     class SnapPackage < Chef::Resource::Package
-      resource_name :snap_package
+      unified_mode true
+
+      provides :snap_package
 
       description "Use the snap_package resource to manage snap packages on Debian and Ubuntu platforms."
       introduced "15.0"

data/lib/chef/resource/solaris_package.rb

@@ -22,12 +22,20 @@ require_relative "package"
 class Chef
   class Resource
     class SolarisPackage < Chef::Resource::Package
-      resource_name :solaris_package
+      unified_mode true
+
       provides :solaris_package
       provides :package, os: "solaris2", platform_family: "nexentacore"
       provides :package, os: "solaris2", platform_family: "solaris2", platform_version: "<= 5.10"
 
       description "The solaris_package resource is used to manage packages for the Solaris platform."
+
+      property :package_name, String,
+        description: "An optional property to set the package name if it differs from the resource block's name.",
+        identity: true
+
+      property :version, String,
+        description: "The version of a package to be installed or upgraded."
     end
   end
 end

data/lib/chef/resource/ssh_known_hosts_entry.rb

@@ -23,7 +23,9 @@ require_relative "../dist"
 class Chef
   class Resource
     class SshKnownHostsEntry < Chef::Resource
-      resource_name :ssh_known_hosts_entry
+      unified_mode true
+
+      provides :ssh_known_hosts_entry
 
       description "Use the ssh_known_hosts_entry resource to add an entry for the specified host in /etc/ssh/ssh_known_hosts or a user's known hosts file if specified."
       introduced "14.3"
@@ -45,7 +47,8 @@ class Chef
 
       property :timeout, Integer,
         description: "The timeout in seconds for ssh-keyscan.",
-        default: 30
+        default: 30,
+        desired_state: false
 
       property :mode, String,
         description: "The file mode for the ssh_known_hosts file.",
@@ -88,7 +91,7 @@ class Chef
 
         r = with_run_context :root do
           find_resource(:template, "update ssh known hosts file #{new_resource.file_location}") do
-            source ::File.expand_path("support/ssh_known_hosts.erb", __dir__)
+            source ::File.expand_path("../support/ssh_known_hosts.erb", __FILE__)
             local true
             path new_resource.file_location
             owner new_resource.owner

data/lib/chef/resource/sudo.rb

@@ -24,7 +24,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class Sudo < Chef::Resource
-      resource_name :sudo
+      unified_mode true
+
       provides(:sudo) { true }
 
       description "Use the sudo resource to add or remove individual sudo entries using sudoers.d files."\
@@ -148,14 +149,13 @@ class Chef
         validate_properties
 
         if docker? # don't even put this into resource collection unless we're in docker
-          declare_resource(:package, "sudo") do
-            action :nothing
+          package "sudo" do
             not_if "which sudo"
-          end.run_action(:install)
+          end
         end
 
         target = "#{new_resource.config_prefix}/sudoers.d/"
-        declare_resource(:directory, target) unless ::File.exist?(target)
+        directory(target)
 
         Chef::Log.warn("#{new_resource.filename} will be rendered, but will not take effect because the #{new_resource.config_prefix}/sudoers config lacks the includedir directive that loads configs from #{new_resource.config_prefix}/sudoers.d/!") if ::File.readlines("#{new_resource.config_prefix}/sudoers").grep(/includedir/).empty?
         file_path = "#{target}#{new_resource.filename}"
@@ -163,7 +163,7 @@ class Chef
         if new_resource.template
           logger.trace("Template property provided, all other properties ignored.")
 
-          declare_resource(:template, file_path) do
+          template file_path do
             source new_resource.template
             mode "0440"
             variables new_resource.variables
@@ -171,8 +171,8 @@ class Chef
             action :create
           end
         else
-          declare_resource(:template, file_path) do
-            source ::File.expand_path("support/sudoer.erb", __dir__)
+          template file_path do
+            source ::File.expand_path("../support/sudoer.erb", __FILE__)
             local true
             mode "0440"
             variables sudoer:            (new_resource.groups + new_resource.users).join(","),
@@ -228,7 +228,7 @@ class Chef
         end
 
         def visudo_content(path)
-          if ::File.exist?(path)
+          if ::File.exists?(path)
             "cat #{new_resource.config_prefix}/sudoers | #{new_resource.visudo_binary} -cf - && #{new_resource.visudo_binary} -cf %{path}"
           else
             "cat #{new_resource.config_prefix}/sudoers %{path} | #{new_resource.visudo_binary} -cf -"

data/lib/chef/resource/support/cron.d.erb

@@ -1,4 +1,4 @@
-# Generated by Chef. Changes will be overwritten.
+# Generated by <%= Chef::Dist::PRODUCT %>. Changes will be overwritten.
 <% if @mailto -%>
 MAILTO=<%= @mailto %>
 <% end -%>

data/lib/chef/resource/support/cron_access.erb

@@ -1,4 +1,4 @@
-# Generated by Chef. Changes will be overwritten.
+# Generated by <%= Chef::Dist::PRODUCT %>. Changes will be overwritten.
 <% @users.sort.uniq.each do |user| -%>
 <%= user %>
 <% end -%>

data/lib/chef/resource/support/sudoer.erb

@@ -1,5 +1,4 @@
-# This file is managed by Chef.
-# Do NOT modify this file directly.
+# This file is managed by <%= Chef::Dist::PRODUCT %>. Changes will be overwritten.
 
 <% @command_aliases.each do |a| -%>
 Cmnd_Alias <%= a[:name].upcase %> = <%= a[:command_list].join(', ') %>

data/lib/chef/resource/support/ulimit.erb

@@ -0,0 +1,41 @@
+# Generated by <%= Chef::Dist::PRODUCT %>. Changes will be overwritten.
+
+# Limits settings for <%= @ulimit_user %>
+
+<% unless @filehandle_limit.nil? -%>
+<%= @ulimit_user -%> - nofile <%= @filehandle_limit %>
+<% else -%><% unless @filehandle_soft_limit.nil? -%><%= @ulimit_user -%> soft nofile <%= @filehandle_soft_limit %><% end -%>
+<% unless @filehandle_hard_limit.nil? -%><%= @ulimit_user -%> hard nofile <%= @filehandle_hard_limit %><% end -%>
+<% end -%>
+
+<% unless @process_limit.nil? -%>
+<%= @ulimit_user -%> - nproc <%= @process_limit %>
+<% else -%><% unless @process_soft_limit.nil? -%><%= @ulimit_user -%> soft nproc <%= @process_soft_limit %><% end -%>
+<% unless @process_hard_limit.nil? -%><%= @ulimit_user -%> hard nproc <%= @process_hard_limit %><% end -%>
+<% end -%>
+
+<% unless @memory_limit.nil? -%>
+<%= @ulimit_user -%> - memlock <%= @memory_limit %>
+<% end -%>
+
+<% unless @core_limit.nil? -%>
+<%= @ulimit_user -%> - core <%= @core_limit %>
+<% else -%><% unless @core_soft_limit.nil? -%><%= @ulimit_user -%> soft core <%= @core_soft_limit %><% end -%>
+<% unless @core_hard_limit.nil? -%><%= @ulimit_user -%> hard core <%= @core_hard_limit %><% end -%>
+<% end -%>
+
+<% unless @stack_limit.nil? -%>
+<%= @ulimit_user -%> - stack <%= @stack_limit %>
+<% else -%><% unless @stack_soft_limit.nil? -%><%= @ulimit_user -%> soft stack <%= @stack_soft_limit %><% end -%>
+<% unless @stack_hard_limit.nil? -%><%= @ulimit_user -%> hard stack <%= @stack_hard_limit %><% end -%>
+<% end -%>
+
+<% unless @rtprio_limit.nil? -%>
+<%= @ulimit_user -%> - rtprio <%= @rtprio_limit %>
+<% else -%><% unless @rtprio_soft_limit.nil? -%><%= @ulimit_user -%> soft rtprio <%= @rtprio_soft_limit %><% end -%>
+<% unless @rtprio_hard_limit.nil? -%><%= @ulimit_user -%> hard rtprio <%= @rtprio_hard_limit %><% end -%>
+<% end -%>
+
+<% unless @virt_limit.nil? -%>
+  <%= @ulimit_user -%> - as <%= @virt_limit %>
+<% end -%>

data/lib/chef/resource/swap_file.rb

@@ -20,7 +20,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class SwapFile < Chef::Resource
-      resource_name :swap_file
+      unified_mode true
+
       provides(:swap_file) { true }
 
       description "Use the swap_file resource to create or delete swap files on Linux systems, and optionally to manage the swappiness configuration for a host."
@@ -39,7 +40,8 @@ class Chef
 
       property :timeout, Integer,
         description: "Timeout for 'dd' / 'fallocate' commands.",
-        default: 600
+        default: 600,
+        desired_state: false
 
       property :swappiness, Integer,
         description: "The swappiness value to set on the system."
@@ -60,7 +62,7 @@ class Chef
           end
         end
         if new_resource.swappiness
-          declare_resource(:sysctl, "vm.swappiness") do
+          sysctl "vm.swappiness" do
             value new_resource.swappiness
           end
         end

data/lib/chef/resource/sysctl.rb

@@ -20,7 +20,8 @@ require_relative "../resource"
 class Chef
   class Resource
     class Sysctl < Chef::Resource
-      resource_name :sysctl
+      unified_mode true
+
       provides(:sysctl) { true }
       provides(:sysctl_param) { true }
 
@@ -56,7 +57,6 @@ class Chef
 
       def after_created
         raise "The sysctl resource requires Linux as it needs sysctl and the sysctl.d directory functionality." unless node["os"] == "linux"
-        raise "The sysctl resource does not support SLES releases less than 12 as it requires a sysctl.d directory" if platform_family?("suse") && node["platform_version"].to_i < 12
       end
 
       def coerce_value(v)

data/lib/chef/resource/systemd_unit.rb

@@ -23,7 +23,9 @@ require "iniparse"
 class Chef
   class Resource
     class SystemdUnit < Chef::Resource
-      resource_name(:systemd_unit) { true }
+      unified_mode true
+
+      provides(:systemd_unit) { true }
 
       description "Use the systemd_unit resource to create, manage, and run systemd units."
       introduced "12.11"
@@ -61,7 +63,7 @@ class Chef
         description: "Specifies if the unit will be verified before installation. Systemd can be overly strict when verifying units, so in certain cases it is preferable not to verify the unit."
 
       property :unit_name, String, desired_state: false,
-               identity: true, name_property: true,
+               name_property: true,
                description: "The name of the unit file if it differs from the resource block's name.",
                introduced: "13.7"
 

data/lib/chef/resource/template.rb

@@ -36,7 +36,6 @@ class Chef
     class Template < Chef::Resource::File
       unified_mode true
 
-      resource_name :template
       provides :template
 
       include Chef::Mixin::Securable

data/lib/chef/resource/timezone.rb

@@ -22,7 +22,9 @@ require_relative "../resource"
 class Chef
   class Resource
     class Timezone < Chef::Resource
-      resource_name :timezone
+      unified_mode true
+
+      provides :timezone
 
       description "Use the timezone resource to change the system timezone on Windows, Linux, and macOS hosts. Timezones are specified in tz database format, with a complete list of available TZ values for Linux and macOS here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones and for Windows here: https://ss64.com/nt/timezones.html."
       introduced "14.6"
@@ -35,14 +37,14 @@ class Chef
         description "Set the timezone."
 
         # some linux systems may be missing the timezone data
-        if node["os"] == "linux"
+        if linux?
           package "tzdata" do
-            package_name platform_family?("suse") ? "timezone" : "tzdata"
+            package_name suse? ? "timezone" : "tzdata"
           end
         end
 
-        # Modern Amazon, Fedora, RHEL, Ubuntu & Debian
-        if node["init_package"] == "systemd"
+        # Modern SUSE, Amazon, Fedora, RHEL, Ubuntu & Debian
+        if systemd?
           cmd_set_tz = "/usr/bin/timedatectl --no-ask-password set-timezone #{new_resource.timezone}"
 
           cmd_check_if_set = "/usr/bin/timedatectl status"
@@ -76,19 +78,6 @@ class Chef
               to "/usr/share/zoneinfo/#{new_resource.timezone}"
               not_if { ::File.executable?("/usr/sbin/tzdata-update") }
             end
-          # debian < 8 and Ubuntu < 16.04
-          when "debian"
-            file "/etc/timezone" do
-              action :create
-              content "#{new_resource.timezone}\n"
-            end
-
-            bash "dpkg-reconfigure tzdata" do
-              user "root"
-              code "/usr/sbin/dpkg-reconfigure -f noninteractive tzdata"
-              action :nothing
-              subscribes :run, "file[/etc/timezone]", :immediately
-            end
           when "mac_os_x"
             unless current_darwin_tz == new_resource.timezone
               converge_by("set timezone to #{new_resource.timezone}") do

data/lib/chef/resource/user.rb

@@ -23,8 +23,6 @@ class Chef
     class User < Chef::Resource
       unified_mode true
 
-      resource_name :user_resource_abstract_base_class # this prevents magickal class name DSL wiring
-
       description "Use the user resource to add users, update existing users, remove users, and to lock/unlock user passwords."
 
       default_action :create
@@ -32,7 +30,7 @@ class Chef
 
       property :username, String,
         description: "An optional property to set the username value if it differs from the resource block's name.",
-        name_property: true, identity: true
+        name_property: true
 
       property :comment, String,
         description: "The contents of the user comments field."

data/lib/chef/resource/user/aix_user.rb

@@ -23,8 +23,6 @@ class Chef
       class AixUser < Chef::Resource::User
         unified_mode true
 
-        resource_name :aix_user
-
         provides :aix_user
         provides :user, os: "aix"
       end

data/lib/chef/resource/user/dscl_user.rb

@@ -21,7 +21,7 @@ class Chef
   class Resource
     class User
       class DsclUser < Chef::Resource::User
-        resource_name :dscl_user
+        unified_mode true
 
         provides :dscl_user
         provides :user, platform: "mac_os_x", platform_version: "< 10.14"

data/lib/chef/resource/user/linux_user.rb

@@ -23,8 +23,6 @@ class Chef
       class LinuxUser < Chef::Resource::User
         unified_mode true
 
-        resource_name :linux_user
-
         provides :linux_user
         provides :user, os: "linux"
 

data/lib/chef/resource/user/mac_user.rb

@@ -58,7 +58,7 @@ class Chef
       #   the 'password' property corresponds to a plaintext password and will
       #   attempt to use it in place of secure_token_password if it not set.
       class MacUser < Chef::Resource::User
-        resource_name :mac_user
+        unified_mode true
 
         provides :mac_user
         provides :user, platform: "mac_os_x", platform_version: ">= 10.14"

data/lib/chef/resource/user/pw_user.rb

@@ -23,8 +23,6 @@ class Chef
       class PwUser < Chef::Resource::User
         unified_mode true
 
-        resource_name :pw_user
-
         provides :pw_user
         provides :user, os: "freebsd"
       end