chef 15.11.3-universal-mingw32 → 16.1.16-universal-mingw32

data/lib/chef/resource/systemd_unit.rb

@@ -23,9 +23,11 @@ require "iniparse"
 class Chef
   class Resource
     class SystemdUnit < Chef::Resource
-      resource_name(:systemd_unit) { true }
+      unified_mode true
 
-      description "Use the systemd_unit resource to create, manage, and run systemd units."
+      provides(:systemd_unit) { true }
+
+      description "Use the **systemd_unit** resource to create, manage, and run systemd units."
       introduced "12.11"
 
       default_action :nothing
@@ -50,7 +52,7 @@ class Chef
                description: "The user account that the systemd unit process is run under. The path to the unit for that user would be something like '/etc/systemd/user/sshd.service'. If no user account is specified, the systemd unit will run under a 'system' account, with the path to the unit being something like '/etc/systemd/system/sshd.service'."
 
       property :content, [String, Hash],
-        description: "A string or hash that contains a systemd `unit file <https://www.freedesktop.org/software/systemd/man/systemd.unit.html>`_ definition that describes the properties of systemd-managed entities, such as services, sockets, devices, and so on. In #{Chef::Dist::PRODUCT} 14.4 or later, repeatable options can be implemented with an array."
+        description: "A string or hash that contains a systemd [unit file](https://www.freedesktop.org/software/systemd/man/systemd.unit.html) definition that describes the properties of systemd-managed entities, such as services, sockets, devices, and so on. In #{Chef::Dist::PRODUCT} 14.4 or later, repeatable options can be implemented with an array."
 
       property :triggers_reload, [TrueClass, FalseClass],
         description: "Specifies whether to trigger a daemon reload when creating or deleting a unit.",
@@ -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,9 +22,11 @@ require_relative "../resource"
 class Chef
   class Resource
     class Timezone < Chef::Resource
-      resource_name :timezone
+      unified_mode true
 
-      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."
+      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"
 
       property :timezone, String,
@@ -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,16 +23,14 @@ 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."
+      description "Use the **user** resource to add users, update existing users, remove users, and to lock/unlock user passwords."
 
       default_action :create
       allowed_actions :create, :remove, :modify, :manage, :lock, :unlock
 
       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."
@@ -57,7 +55,7 @@ class Chef
         default: false, desired_state: false
 
       property :manage_home, [ TrueClass, FalseClass ],
-        description: "Manage a user’s home directory.\nWhen used with the :create action, a user’s home directory is created based on HOME_DIR. If the home directory is missing, it is created unless CREATE_HOME in /etc/login.defs is set to no. When created, a skeleton set of files and subdirectories are included within the home directory.\nWhen used with the :modify action, a user’s home directory is moved to HOME_DIR. If the home directory is missing, it is created unless CREATE_HOME in /etc/login.defs is set to no. The contents of the user’s home directory are moved to the new location.",
+        description: "Manage a user's home directory.\nWhen used with the :create action, a user's home directory is created based on HOME_DIR. If the home directory is missing, it is created unless CREATE_HOME in /etc/login.defs is set to no. When created, a skeleton set of files and subdirectories are included within the home directory.\nWhen used with the :modify action, a user's home directory is moved to HOME_DIR. If the home directory is missing, it is created unless CREATE_HOME in /etc/login.defs is set to no. The contents of the user's home directory are moved to the new location.",
         default: false, desired_state: false
 
       property :force, [ TrueClass, FalseClass ],

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

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

@@ -23,8 +23,6 @@ class Chef
       class SolarisUser < Chef::Resource::User
         unified_mode true
 
-        resource_name :solaris_user
-
         provides :solaris_user
         provides :user, os: %w{omnios solaris2}
       end

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

@@ -23,8 +23,6 @@ class Chef
       class WindowsUser < Chef::Resource::User
         unified_mode true
 
-        resource_name :windows_user
-
         provides :windows_user
         provides :user, os: "windows"
 

data/lib/chef/resource/user_ulimit.rb

@@ -0,0 +1,116 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: 2012, Brightcove, Inc
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../resource"
+
+class Chef
+  class Resource
+    class UserUlimit < Chef::Resource
+      unified_mode true
+
+      provides :user_ulimit
+
+      description "Use the **user_ulimit** resource to create individual ulimit files that are installed into the `/etc/security/limits.d/` directory."
+      introduced "16.0"
+      examples <<~DOC
+      **Set filehandle limit for the tomcat user**:
+
+      ```ruby
+      user_ulimit 'tomcat' do
+        filehandle_limit 8192
+      end
+      ```
+
+      **Specify a username that differs from the name given to the resource block**:
+
+      ```ruby
+      user_ulimit 'Bump filehandle limits for tomcat user' do
+        username 'tomcat'
+        filehandle_limit 8192
+      end
+      ```
+
+      **Set filehandle limit for the tomcat user with a non-default filename**:
+
+      ```ruby
+      user_ulimit 'tomcat' do
+        filehandle_limit 8192
+        filename 'tomcat_filehandle_limits.conf'
+      end
+      ```
+      DOC
+
+      property :username, String, name_property: true
+      property :filehandle_limit, [String, Integer]
+      property :filehandle_soft_limit, [String, Integer]
+      property :filehandle_hard_limit, [String, Integer]
+      property :process_limit, [String, Integer]
+      property :process_soft_limit, [String, Integer]
+      property :process_hard_limit, [String, Integer]
+      property :memory_limit, [String, Integer]
+      property :core_limit, [String, Integer]
+      property :core_soft_limit, [String, Integer]
+      property :core_hard_limit, [String, Integer]
+      property :stack_limit, [String, Integer]
+      property :stack_soft_limit, [String, Integer]
+      property :stack_hard_limit, [String, Integer]
+      property :rtprio_limit, [String, Integer]
+      property :rtprio_soft_limit, [String, Integer]
+      property :rtprio_hard_limit, [String, Integer]
+      property :virt_limit, [String, Integer]
+      property :filename, String,
+               coerce: proc { |m| m.end_with?(".conf") ? m : m + ".conf" },
+               default: lazy { |r| r.username == "*" ? "00_all_limits.conf" : "#{r.username}_limits.conf" }
+
+      action :create do
+        template "/etc/security/limits.d/#{new_resource.filename}" do
+          source ::File.expand_path("../support/ulimit.erb", __FILE__)
+          local true
+          mode "0644"
+          variables(
+            ulimit_user: new_resource.username,
+            filehandle_limit: new_resource.filehandle_limit,
+            filehandle_soft_limit: new_resource.filehandle_soft_limit,
+            filehandle_hard_limit: new_resource.filehandle_hard_limit,
+            process_limit: new_resource.process_limit,
+            process_soft_limit: new_resource.process_soft_limit,
+            process_hard_limit: new_resource.process_hard_limit,
+            memory_limit: new_resource.memory_limit,
+            core_limit: new_resource.core_limit,
+            core_soft_limit: new_resource.core_soft_limit,
+            core_hard_limit: new_resource.core_hard_limit,
+            stack_limit: new_resource.stack_limit,
+            stack_soft_limit: new_resource.stack_soft_limit,
+            stack_hard_limit: new_resource.stack_hard_limit,
+            rtprio_limit: new_resource.rtprio_limit,
+            rtprio_soft_limit: new_resource.rtprio_soft_limit,
+            rtprio_hard_limit: new_resource.rtprio_hard_limit,
+            virt_limit: new_resource.virt_limit
+          )
+        end
+      end
+
+      action :delete do
+        file "/etc/security/limits.d/#{new_resource.filename}" do
+          action :delete
+        end
+      end
+    end
+  end
+end

data/lib/chef/resource/whyrun_safe_ruby_block.rb

@@ -19,6 +19,7 @@
 class Chef
   class Resource
     class WhyrunSafeRubyBlock < Chef::Resource::RubyBlock
+      provides :whyrun_safe_ruby_block
       unified_mode true
     end
   end

data/lib/chef/resource/windows_ad_join.rb

@@ -16,18 +16,14 @@
 #
 
 require_relative "../resource"
-require_relative "../mixin/powershell_out"
 require_relative "../dist"
 
 class Chef
   class Resource
     class WindowsAdJoin < Chef::Resource
-      resource_name :windows_ad_join
       provides :windows_ad_join
 
-      include Chef::Mixin::PowershellOut
-
-      description "Use the windows_ad_join resource to join a Windows Active Directory domain."
+      description "Use the **windows_ad_join** resource to join a Windows Active Directory domain."
       introduced "14.0"
 
       property :domain_name, String,
@@ -70,7 +66,7 @@ class Chef
 
         unless on_desired_domain?
           cmd = "$pswd = ConvertTo-SecureString \'#{new_resource.domain_password}\' -AsPlainText -Force;"
-          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}@#{new_resource.domain_name}\",$pswd);"
+          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{sanitize_usename}\",$pswd);"
           cmd << "Add-Computer -DomainName #{new_resource.domain_name} -Credential $credential"
           cmd << " -OUPath \"#{new_resource.ou_path}\"" if new_resource.ou_path
           cmd << " -NewName \"#{new_resource.new_hostname}\"" if new_resource.new_hostname
@@ -102,7 +98,7 @@ class Chef
         if joined_to_domain?
           cmd = ""
           cmd << "$pswd = ConvertTo-SecureString \'#{new_resource.domain_password}\' -AsPlainText -Force;"
-          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{new_resource.domain_user}@#{new_resource.domain_name}\",$pswd);"
+          cmd << "$credential = New-Object System.Management.Automation.PSCredential (\"#{sanitize_usename}\",$pswd);"
           cmd << "Remove-Computer"
           cmd << " -UnjoinDomainCredential $credential"
           cmd << " -NewName \"#{new_resource.new_hostname}\"" if new_resource.new_hostname
@@ -169,6 +165,23 @@ class Chef
           node_domain == new_resource.domain_name.downcase
         end
 
+        #
+        # @return [String] the correct user and domain to use.
+        #   if the domain_user property contains an @ symbol followed by any number of non white space characters
+        #   then we assume it is a user from another domain than the one specified in the resource domain_name property.
+        #   if this is the case we do not append the domain_name property to the domain_user property
+        #   the domain_user and domain_name form the UPN (userPrincipalName)
+        #   The specification for the UPN format is RFC 822
+        #   links: https://docs.microsoft.com/en-us/windows/win32/ad/naming-properties#userprincipalname https://tools.ietf.org/html/rfc822
+        #   regex: https://rubular.com/r/isAWojpTMKzlnp
+        def sanitize_usename
+          if new_resource.domain_user =~ /@/
+            new_resource.domain_user
+          else
+            "#{new_resource.domain_user}@#{new_resource.domain_name}"
+          end
+        end
+
         # This resource historically took `:immediate` and `:delayed` as arguments to the reboot property but then
         # tried to shove that straight to the `reboot` resource which objected strenuously
         def clarify_reboot(reboot_action)

data/lib/chef/resource/windows_auto_run.rb

@@ -21,10 +21,9 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsAutorun < Chef::Resource
-      resource_name :windows_auto_run
       provides(:windows_auto_run) { true }
 
-      description "Use the windows_auto_run resource to set applications to run at login."
+      description "Use the **windows_auto_run** resource to set applications to run at login."
       introduced "14.0"
 
       property :program_name, String,
@@ -33,7 +32,7 @@ class Chef
 
       property :path, String,
         coerce: proc { |x| x.tr("/", "\\") }, # make sure we have windows paths for the registry
-        description: "The path to the program that will run at login. "
+        description: "The path to the program that will run at login."
 
       property :args, String,
         description: "Any arguments to be used with the program."

data/lib/chef/resource/windows_certificate.rb

@@ -26,9 +26,9 @@ require_relative "../dist"
 class Chef
   class Resource
     class WindowsCertificate < Chef::Resource
-      resource_name :windows_certificate
+      provides :windows_certificate
 
-      description "Use the windows_certificate resource to install a certificate into the Windows certificate store from a file. The resource grants read-only access to the private key for designated accounts. Due to current limitations in WinRM, installing certificates remotely may not work if the operation requires a user profile. Operations on the local machine store should still work."
+      description "Use the **windows_certificate** resource to install a certificate into the Windows certificate store from a file. The resource grants read-only access to the private key for designated accounts. Due to current limitations in WinRM, installing certificates remotely may not work if the operation requires a user profile. Operations on the local machine store should still work."
       introduced "14.7"
 
       property :source, String,
@@ -308,7 +308,7 @@ class Chef
         #
         def import_certificates(cert_objs, is_pfx)
           [cert_objs].flatten.each do |cert_obj|
-            thumbprint = OpenSSL::Digest::SHA1.new(cert_obj.to_der).to_s # Fetch its thumbprint
+            thumbprint = OpenSSL::Digest.new("SHA1", cert_obj.to_der).to_s # Fetch its thumbprint
             # Need to check if return value is Boolean:true
             # If not then the given certificate should be added in certstore
             if verify_cert(thumbprint) == true

data/lib/chef/resource/windows_dfs_folder.rb

@@ -21,10 +21,9 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDfsFolder < Chef::Resource
-      resource_name :windows_dfs_folder
       provides :windows_dfs_folder
 
-      description "The windows_dfs_folder resources creates a folder within dfs as many levels deep as required."
+      description "Use the **windows_dfs_folder** resource to creates a folder within DFS as many levels deep as required."
       introduced "15.0"
 
       property :folder_path, String,

data/lib/chef/resource/windows_dfs_namespace.rb

@@ -21,10 +21,9 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDfsNamespace < Chef::Resource
-      resource_name :windows_dfs_namespace
       provides :windows_dfs_namespace
 
-      description "Creates a share and DFS namespace on the local server."
+      description "Use the **windows_dfs_namespace** resource to creates a share and DFS namespace on a Windows server."
       introduced "15.0"
 
       property :namespace_name, String,

data/lib/chef/resource/windows_dfs_server.rb

@@ -21,10 +21,9 @@ require_relative "../resource"
 class Chef
   class Resource
     class WindowsDfsServer < Chef::Resource
-      resource_name :windows_dfs_server
       provides :windows_dfs_server
 
-      description "The windows_dfs_server resource sets system-wide DFS settings."
+      description "Use the **windows_dfs_server** resource to set system-wide DFS settings."
       introduced "15.0"
 
       property :use_fqdn, [TrueClass, FalseClass],
@@ -51,7 +50,7 @@ class Chef
         ps_results = powershell_out("Get-DfsnServerConfiguration -ComputerName '#{ENV["COMPUTERNAME"]}' | Select LdapTimeoutSec, PreferLogonDC, EnableSiteCostedReferrals, SyncIntervalSec, UseFqdn | ConvertTo-Json")
 
         if ps_results.error?
-          raise "The dfs_server resource failed to fetch the current state via the Get-DfsnServerConfiguration PowerShell cmlet. Is the DFS Windows feature installed?"
+          raise "The dfs_server resource failed to fetch the current state via the Get-DfsnServerConfiguration PowerShell cmdlet. Is the DFS Windows feature installed?"
         end
 
         Chef::Log.debug("The Get-DfsnServerConfiguration results were #{ps_results.stdout}")