chef 15.17.4 → 16.0.257

data/lib/chef/resource/http_request.rb

@@ -24,7 +24,6 @@ class Chef
     class HttpRequest < Chef::Resource
       unified_mode true
 
-      resource_name :http_request
       provides :http_request
 
       description "Use the http_request resource to send an HTTP request (GET, PUT, POST, DELETE, HEAD, or OPTIONS) with an arbitrary message. This resource is often useful when custom callbacks are necessary."

data/lib/chef/resource/ifconfig.rb

@@ -28,7 +28,7 @@ class Chef
     class Ifconfig < Chef::Resource
       unified_mode true
 
-      resource_name :ifconfig
+      provides :ifconfig
 
       description "Use the ifconfig resource to manage interfaces on Unix and Linux systems."
 

data/lib/chef/resource/ips_package.rb

@@ -22,14 +22,22 @@ require_relative "../provider/package/ips"
 class Chef
   class Resource
     class IpsPackage < ::Chef::Resource::Package
-      resource_name :ips_package
-      provides :package, os: "solaris2"
+      unified_mode true
+
       provides :ips_package
+      provides :package, os: "solaris2"
 
       description "Use the ips_package resource to manage packages (using Image Packaging System (IPS)) on the Solaris 11 platform."
 
       allowed_actions :install, :remove, :upgrade
 
+      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."
+
       property :accept_license, [TrueClass, FalseClass],
         default: false, desired_state: false,
         description: "Accept an end-user license agreement, automatically."

data/lib/chef/resource/kernel_module.rb

@@ -5,14 +5,15 @@
 #
 # Copyright:: 2016-2018, Shopify Inc.
 # Copyright:: Copyright (c) Chef Software Inc.
-#
 
 require_relative "../resource"
 
 class Chef
   class Resource
     class KernelModule < Chef::Resource
-      resource_name :kernel_module
+      unified_mode true
+
+      provides :kernel_module
 
       description "Use the kernel_module resource to manage kernel modules on Linux systems. This resource can load, unload, blacklist, disable, install, and uninstall modules."
       introduced "14.3"
@@ -65,7 +66,7 @@ class Chef
 
       property :modname, String,
         description: "An optional property to set the kernel module name if it differs from the resource block's name.",
-        name_property: true, identity: true
+        name_property: true
 
       property :options, Array,
         description: "An optional property to set options for the kernel module.",
@@ -82,15 +83,22 @@ class Chef
       action :install do
         description "Load kernel module, and ensure it loads on reboot."
 
+        with_run_context :root do
+          find_resource(:execute, "update initramfs") do
+            command initramfs_command
+            action :nothing
+          end
+        end
+
         # create options file before loading the module
         unless new_resource.options.nil?
           file "#{new_resource.unload_dir}/options_#{new_resource.modname}.conf" do
             content "options #{new_resource.modname} #{new_resource.options.join(" ")}\n"
-          end.run_action(:create)
+          end
         end
 
         # load the module first before installing
-        new_resource.run_action(:load)
+        action_load
 
         directory new_resource.load_dir do
           recursive true
@@ -100,17 +108,16 @@ class Chef
           content "#{new_resource.modname}\n"
           notifies :run, "execute[update initramfs]", :delayed
         end
+      end
 
+      action :uninstall do
+        description "Unload a kernel module and remove module config, so it doesn't load on reboot."
         with_run_context :root do
           find_resource(:execute, "update initramfs") do
             command initramfs_command
             action :nothing
           end
         end
-      end
-
-      action :uninstall do
-        description "Unload a kernel module and remove module config, so it doesn't load on reboot."
 
         file "#{new_resource.load_dir}/#{new_resource.modname}.conf" do
           action :delete
@@ -126,24 +133,12 @@ class Chef
           action :delete
         end
 
-        with_run_context :root do
-          find_resource(:execute, "update initramfs") do
-            command initramfs_command
-            action :nothing
-          end
-        end
-
-        new_resource.run_action(:unload)
+        action_unload
       end
 
       action :blacklist do
         description "Blacklist a kernel module."
 
-        file "#{new_resource.unload_dir}/blacklist_#{new_resource.modname}.conf" do
-          content "blacklist #{new_resource.modname}"
-          notifies :run, "execute[update initramfs]", :delayed
-        end
-
         with_run_context :root do
           find_resource(:execute, "update initramfs") do
             command initramfs_command
@@ -151,17 +146,17 @@ class Chef
           end
         end
 
-        new_resource.run_action(:unload)
+        file "#{new_resource.unload_dir}/blacklist_#{new_resource.modname}.conf" do
+          content "blacklist #{new_resource.modname}"
+          notifies :run, "execute[update initramfs]", :delayed
+        end
+
+        action_unload
       end
 
       action :disable do
         description "Disable a kernel module."
 
-        file "#{new_resource.unload_dir}/disable_#{new_resource.modname}.conf" do
-          content "install #{new_resource.modname} /bin/false"
-          notifies :run, "execute[update initramfs]", :delayed
-        end
-
         with_run_context :root do
           find_resource(:execute, "update initramfs") do
             command initramfs_command
@@ -169,7 +164,12 @@ class Chef
           end
         end
 
-        new_resource.run_action(:unload)
+        file "#{new_resource.unload_dir}/disable_#{new_resource.modname}.conf" do
+          content "install #{new_resource.modname} /bin/false"
+          notifies :run, "execute[update initramfs]", :delayed
+        end
+
+        action_unload
       end
 
       action :load do

data/lib/chef/resource/ksh.rb

@@ -23,6 +23,8 @@ class Chef
     class Ksh < Chef::Resource::Script
       unified_mode true
 
+      provides :ksh
+
       description "Use the ksh resource to execute scripts using the Korn shell (ksh)"\
                   " interpreter. This resource may also use any of the actions and properties"\
                   " that are available to the execute resource. Commands that are executed"\

data/lib/chef/resource/launchd.rb

@@ -21,7 +21,7 @@ require_relative "../resource"
 class Chef
   class Resource
     class Launchd < Chef::Resource
-      resource_name :launchd
+      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."
@@ -31,7 +31,7 @@ class Chef
       allowed_actions :create, :create_if_missing, :delete, :enable, :disable, :restart
 
       property :label, String,
-        identity: true, name_property: true,
+        name_property: true,
         description: "The unique identifier for the job."
 
       property :backup, [Integer, FalseClass],
@@ -76,20 +76,20 @@ class Chef
       property :start_calendar_interval, [Hash, Array],
         description: "A Hash (similar to crontab) that defines the calendar frequency at which a job is started or an Array.",
         coerce: proc { |type|
-          # Coerce into an array of hashes to make validation easier
+                  # Coerce into an array of hashes to make validation easier
           array = if type.is_a?(Array)
                     type
                   else
                     [type]
                   end
 
-          # Check to make sure that our array only has hashes
+                  # Check to make sure that our array only has hashes
           unless array.all? { |obj| obj.is_a?(Hash) }
             error_msg = "start_calendar_interval must be a single hash or an array of hashes!"
             raise Chef::Exceptions::ValidationFailed, error_msg
           end
 
-          # Make sure the hashes don't have any incorrect keys/values
+                  # Make sure the hashes don't have any incorrect keys/values
           array.each do |entry|
             allowed_keys = %w{Minute Hour Day Weekday Month}
             unless entry.keys.all? { |key| allowed_keys.include?(key) }
@@ -105,7 +105,7 @@ class Chef
             end
           end
 
-          # Don't return array if we only have one entry
+                  # Don't return array if we only have one entry
           if array.size == 1
             array.first
           else

data/lib/chef/resource/link.rb

@@ -26,7 +26,6 @@ class Chef
       include Chef::Mixin::Securable
       unified_mode true
 
-      resource_name :link
       provides :link
 
       description "Use the link resource to create symbolic or hard links.\n\n"\
@@ -44,14 +43,9 @@ class Chef
       default_action :create
       allowed_actions :create, :delete
 
-      def initialize(name, run_context = nil)
-        verify_links_supported!
-        super
-      end
-
       property :target_file, String,
         description: "An optional property to set the target file if it differs from the resource block's name.",
-        name_property: true, identity: true
+        name_property: true
 
       property :to, String,
         description: "The actual file to which the link is to be created."
@@ -73,22 +67,6 @@ class Chef
       def path
         target_file
       end
-
-      private
-
-      # On certain versions of windows links are not supported. Make
-      # sure we are not on such a platform.
-      def verify_links_supported!
-        if ChefUtils.windows?
-          require_relative "../win32/file"
-          begin
-            Chef::ReservedNames::Win32::File.verify_links_supported!
-          rescue Chef::Exceptions::Win32APIFunctionNotImplemented => e
-            Chef::Log.fatal("Link resource is not supported on this version of Windows")
-            raise e
-          end
-        end
-      end
     end
   end
 end

data/lib/chef/resource/locale.rb

@@ -21,15 +21,26 @@ require_relative "../dist"
 class Chef
   class Resource
     class Locale < Chef::Resource
-      resource_name :locale
+      unified_mode true
+      provides :locale
 
-      description "Use the locale resource to set the system's locale."
+      description "Use the locale resource to set the system's locale on Debian and Windows systems. Windows support was added in Chef Infra Client 16.0"
       introduced "14.5"
 
-      LC_VARIABLES = %w{LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME}.freeze
-      LOCALE_CONF = "/etc/locale.conf".freeze
-      LOCALE_REGEX = /\A\S+/.freeze
-      LOCALE_PLATFORM_FAMILIES = %w{debian}.freeze
+      examples <<~DOC
+      Set the lang to 'en_US.UTF-8'
+
+      ```ruby
+        locale 'set system locale' do
+          lang 'en_US.UTF-8'
+        end
+      ```
+      DOC
+
+      LC_VARIABLES ||= %w{LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME}.freeze
+      LOCALE_CONF ||= "/etc/locale.conf".freeze
+      LOCALE_REGEX ||= /\A\S+/.freeze
+      LOCALE_PLATFORM_FAMILIES ||= %w{debian windows}.freeze
 
       property :lang, String,
         description: "Sets the default system language.",
@@ -37,7 +48,7 @@ class Chef
         validation_message: "The provided lang is not valid. It should be a non-empty string without any leading whitespaces."
 
       property :lc_env, Hash,
-        description: "A Hash of LC_* env variables in the form of ({ 'LC_ENV_VARIABLE' => 'VALUE' }).",
+        description: "A Hash of LC_* env variables in the form of `({ 'LC_ENV_VARIABLE' => 'VALUE' })`.",
         default: lazy { {} },
         coerce: proc { |h|
           if h.respond_to?(:keys)
@@ -64,15 +75,32 @@ class Chef
         end
       end
 
+      load_current_value do
+        if windows?
+          lang get_system_locale_windows
+        else
+          begin
+            old_content = ::File.read(LOCALE_CONF)
+            locale_values = Hash[old_content.split("\n").map { |v| v.split("=") }]
+            lang locale_values["LANG"]
+          rescue Errno::ENOENT => e
+            false
+          end
+        end
+      end
+
+      # Gets the System-locale setting for the current computer.
+      # @see https://docs.microsoft.com/en-us/powershell/module/international/get-winsystemlocale
+      # @return [String] the current value of the System-locale setting.
+      #
+      def get_system_locale_windows
+        powershell_exec("Get-WinSystemLocale").result["Name"]
+      end
+
       action :update do
         description "Update the system's locale."
-        begin
-          unless up_to_date?
-            converge_by "Updating System Locale" do
-              generate_locales unless unavailable_locales.empty?
-              update_locale
-            end
-          end
+        converge_if_changed do
+          set_system_locale
         end
       end
 
@@ -97,7 +125,22 @@ class Chef
         # @raise [Mixlib::ShellOut::ShellCommandFailed] not a supported language or locale
         #
         def generate_locales
-          shell_out!("locale-gen #{unavailable_locales.join(" ")}", timeout: 1800)
+          shell_out!("locale-gen #{unavailable_locales.join(" ")}")
+        end
+
+        # Sets the system locale for the current computer.
+        #
+        def set_system_locale
+          if windows?
+            # Sets the system locale for the current computer.
+            # @see https://docs.microsoft.com/en-us/powershell/module/internationalcmdlets/set-winsystemlocale
+            #
+            response = powershell_exec("Set-WinSystemLocale -SystemLocale #{new_resource.lang}")
+            raise response.errors.join(" ") if response.error?
+          else
+            generate_locales unless unavailable_locales.empty?
+            update_locale
+          end
         end
 
         # Updates system locale by appropriately writing them in /etc/locale.conf
@@ -135,15 +178,6 @@ class Chef
             content.sort.map { |t| t.join("=") }.join("\n") + "\n"
           end
         end
-
-        # @return [Boolean] Whether any modification is required in /etc/locale.conf
-        #
-        def up_to_date?
-          old_content = ::File.read(LOCALE_CONF)
-          new_content == old_content
-        rescue
-          false # We need to create the file if it is not present
-        end
       end
     end
   end

data/lib/chef/resource/log.rb

@@ -31,7 +31,6 @@ class Chef
     class Log < Chef::Resource
       unified_mode true
 
-      resource_name :log
       provides :log, target_mode: true
 
       description "Use the log resource to create log entries. The log resource behaves"\
@@ -50,6 +49,18 @@ class Chef
 
       allowed_actions :write
       default_action :write
+
+      def suppress_up_to_date_messages?
+        true
+      end
+
+      # Write the log to Chef's log
+      #
+      # @return [true] Always returns true
+      action :write do
+        logger.send(new_resource.level, new_resource.message)
+        new_resource.updated_by_last_action(true) if Chef::Config[:count_log_resource_updates]
+      end
     end
   end
 end

data/lib/chef/resource/lwrp_base.rb

@@ -65,15 +65,9 @@ class Chef
 
           LWRPBase.loaded_lwrps[filename] = true
 
-          unless resource_class.resource_name.nil?
-            if Chef.resource_handler_map.get(node, resource_class.resource_name, canonical: true) == resource_class
-              Chef.deprecated(:resource_name_without_provides, "Resource #{resource_class.resource_name} needs `provides :#{resource_class.resource_name}` in addition to `resource_name :#{resource_class.resource_name}` declaration")
-            end
-          end
-
           # wire up the default resource name after the class is parsed only if we haven't declared one.
           # (this ordering is important for MapCollision deprecation warnings)
-          resource_class.resource_name resource_name.to_sym if resource_class.resource_name.nil?
+          resource_class.provides resource_name.to_sym unless Chef::ResourceResolver.includes_handler?(resource_name.to_sym, self)
 
           resource_class
         end
@@ -109,7 +103,6 @@ class Chef
         protected
 
         attr_writer :loaded_lwrps
-
         def loaded_lwrps
           @loaded_lwrps ||= {}
         end