chef 19.3.15 → 19.4.46

data/lib/chef/resource/helpers/path_helpers.rb

@@ -29,8 +29,8 @@ class Chef
         # return path for any bin/chef-* names
         return path.sub(bin, ChefUtils::Dist::Infra::CLIENT) if bin =~ /^chef-[a-z-]+$/
 
-        # Return empty string if no valid path is found
-        ""
+        # Fall back to legacy path if no valid path is found
+        which(ChefUtils::Dist::Infra::CLIENT)
       end
 
       # once the binstubs under hab package have been fixed,

data/lib/chef/resource/homebrew_cask.rb

@@ -55,7 +55,13 @@ class Chef
               command "#{homebrew_bin_path(new_resource.homebrew_path)} install --cask #{new_resource.cask_name} #{new_resource.options}"
               user new_resource.owner
               cwd ::Dir.home(new_resource.owner)
-              login true
+              # NOTE: intentionally not using `login true` here. Executing brew via a login
+              # shell can cause Homebrew's vendored (setgid) portable-ruby to fail with
+              # "no -I allowed while running setgid (SecurityError)" during cask installs.
+              # See https://github.com/chef/chef/issues/14885 for the same issue in the
+              # homebrew_package provider. We instead set the environment explicitly, which
+              # is what a login shell would otherwise have done for us.
+              environment "HOME" => ::Dir.home(new_resource.owner), "RUBYOPT" => nil, "TMPDIR" => nil
             end
           end
         end
@@ -68,7 +74,8 @@ class Chef
               command "#{homebrew_bin_path(new_resource.homebrew_path)} uninstall --cask #{new_resource.cask_name}"
               user new_resource.owner
               cwd ::Dir.home(new_resource.owner)
-              login true
+              # See NOTE above in :install about avoiding `login true`.
+              environment "HOME" => ::Dir.home(new_resource.owner), "RUBYOPT" => nil, "TMPDIR" => nil
             end
           end
         end
@@ -87,9 +94,8 @@ class Chef
           shell_out!(
             "#{homebrew_bin_path(new_resource.homebrew_path)} list --cask 2>/dev/null",
             user: new_resource.owner,
-            env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner },
-            cwd: ::Dir.home(new_resource.owner),
-            login: true
+            env:  { "HOME" => ::Dir.home(new_resource.owner), "USER" => new_resource.owner, "RUBYOPT" => nil, "TMPDIR" => nil },
+            cwd: ::Dir.home(new_resource.owner)
           ).stdout.split.include?(unscoped_name)
         end
       end

data/lib/chef/resource/homebrew_tap.rb

@@ -59,6 +59,24 @@ class Chef
       action :tap, description: "Add a Homebrew tap." do
         unless tapped?(new_resource.tap_name)
           converge_by("tap #{new_resource.tap_name}") do
+            # Homebrew 6.0+ requires non-official taps to be explicitly trusted
+            # before their formulae/casks/commands can be loaded (see
+            # https://docs.brew.sh/Tap-Trust). Without this, `brew tap` on a
+            # third-party tap fails with "Refusing to load cask ... from
+            # untrusted tap"/"invalid syntax in tap!". Trust the tap before
+            # tapping it. `ignore_failure` covers Homebrew releases that
+            # predate the `trust` command (or any future release that removes
+            # it) -- on those, this step simply no-ops and `brew tap` behaves
+            # exactly as it did before this change.
+            execute "trust #{new_resource.tap_name}" do
+              command "#{homebrew_bin_path(new_resource.homebrew_path)} trust #{new_resource.tap_name}"
+              user new_resource.owner
+              default_env true
+              cwd ::Dir.home(new_resource.owner)
+              login true
+              ignore_failure true
+            end
+
             execute "tap #{new_resource.tap_name}" do
               command "#{homebrew_bin_path(new_resource.homebrew_path)} tap #{new_resource.tap_name} #{new_resource.url || ""}"
               user new_resource.owner

data/lib/chef/resource/launchd.rb

@@ -98,7 +98,7 @@ class Chef
             end
 
             unless entry.values.all?(Integer)
-              failed_values = entry.values.reject { |val| val.is_a?(Integer) }.join(", ")
+              failed_values = entry.values.grep_v(Integer).join(", ")
               error_msg = "Invalid value(s) (#{failed_values}) for start_calendar_interval item.  Values must be integers!"
               raise Chef::Exceptions::ValidationFailed, error_msg
             end

data/lib/chef/resource/mount.rb

@@ -26,7 +26,7 @@ class Chef
 
       provides :mount, target_mode: true
       target_mode support: :full,
-        platforms: %i{aix bsd linux}
+        platforms: %i{aix bsd linux solaris}
 
       default_action :mount
       allowed_actions :mount, :umount, :unmount, :remount, :enable, :disable
@@ -36,7 +36,7 @@ class Chef
         description: "Specify a Hash of supported mount features.",
         default: lazy { { remount: false } },
         default_description: "{ remount: false }",
-        coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x }
+        coerce: proc { |x| x.is_a?(Array) ? x.to_h { |i| [i, true] } : x }
 
       property :password, String,
         description: "Windows only:. Use to specify the password for username.",

data/lib/chef/resource/openssl_ec_private_key.rb

@@ -60,7 +60,7 @@ class Chef
         description: "The desired curve of the generated key (if key_type is equal to 'ec'). Run openssl ecparam -list_curves to see available options.",
         default: "prime256v1"
 
-      property :key_pass, String,
+      property :key_pass, String, sensitive: true,
         description: "The desired passphrase for the key."
 
       property :key_cipher, String,

data/lib/chef/resource/openssl_ec_public_key.rb

@@ -56,10 +56,10 @@ class Chef
       property :private_key_path, String,
         description: "The path to the private key file."
 
-      property :private_key_content, String,
+      property :private_key_content, String, sensitive: true,
         description: "The content of the private key including new lines. This property is used in place of private_key_path in instances where you want to avoid having to first write the private key to disk"
 
-      property :private_key_pass, String,
+      property :private_key_pass, String, sensitive: true,
         description: "The passphrase of the provided private key."
 
       property :owner, [String, Integer],

data/lib/chef/resource/openssl_rsa_private_key.rb

@@ -59,7 +59,7 @@ class Chef
         description: "The desired bit length of the generated key.",
         default: 2048
 
-      property :key_pass, String,
+      property :key_pass, String, sensitive: true,
         description: "The desired passphrase for the key."
 
       property :key_cipher, String,

data/lib/chef/resource/openssl_rsa_public_key.rb

@@ -57,10 +57,10 @@ class Chef
       property :private_key_path, String,
         description: "The path to the private key file."
 
-      property :private_key_content, String,
+      property :private_key_content, String, sensitive: true,
         description: "The content of the private key, including new lines. This property is used in place of private_key_path in instances where you want to avoid having to first write the private key to disk."
 
-      property :private_key_pass, String,
+      property :private_key_pass, String, sensitive: true,
         description: "The passphrase of the provided private key."
 
       property :owner, [String, Integer],

data/lib/chef/resource/openssl_x509_certificate.rb

@@ -115,7 +115,7 @@ class Chef
       property :key_file, String,
         description: "The path to a certificate key file on the filesystem. If the key_file property is specified, the resource will attempt to source a key from this location. If no key file is found, the resource will generate a new key file at this location. If the key_file property is not specified, the resource will generate a key file in the same directory as the generated certificate, with the same name as the generated certificate."
 
-      property :key_pass, String,
+      property :key_pass, String, sensitive: true,
         description: "The passphrase for an existing key's passphrase."
 
       property :key_type, String,

data/lib/chef/resource/openssl_x509_request.rb

@@ -102,7 +102,7 @@ class Chef
       property :key_file, String,
         description: "The path to a certificate key file on the filesystem. If the `key_file` property is specified, the resource will attempt to source a key from this location. If no key file is found, the resource will generate a new key file at this location. If the `key_file` property is not specified, the resource will generate a key file in the same directory as the generated certificate, with the same name as the generated certificate."
 
-      property :key_pass, String,
+      property :key_pass, String, sensitive: true,
         description: "The passphrase for an existing key's passphrase."
 
       property :key_type, String,

data/lib/chef/resource/powershell_package_source.rb

@@ -143,7 +143,7 @@ class Chef
         introduced: "17.6",
         description: "A username that, as part of a credential object, is used to register a repository or other package source with."
 
-      property :password, String,
+      property :password, String, sensitive: true,
         introduced: "17.6",
         description: "A password that, as part of a credential object, is used to register a repository or other package source with."
 

data/lib/chef/resource/rhsm_register.rb

@@ -54,7 +54,7 @@ class Chef
       property :username, String,
         description: "The username to use when registering. This property is not applicable if using an activation key. If specified, password and environment properties are also required."
 
-      property :password, String,
+      property :password, String, sensitive: true,
         description: "The password to use when registering. This property is not applicable if using an activation key. If specified, username and environment are also required."
 
       property :system_name, String,

data/lib/chef/resource/service.rb

@@ -42,7 +42,7 @@ class Chef
       # this is a poor API please do not re-use this pattern
       property :supports, Hash, default: { restart: nil, reload: nil, status: nil },
                description: "A list of properties that controls how #{ChefUtils::Dist::Infra::PRODUCT} is to attempt to manage a service: :restart, :reload, :status. For :restart, the init script or other service provider can use a restart command; if :restart is not specified, the #{ChefUtils::Dist::Infra::CLIENT} attempts to stop and then start a service. For :reload, the init script or other service provider can use a reload command. For :status, the init script or other service provider can use a status command to determine if the service is running; if :status is not specified, the #{ChefUtils::Dist::Infra::CLIENT} attempts to match the service_name against the process table as a regular expression, unless a pattern is specified as a parameter property. Default value: { restart: false, reload: false, status: false } for all platforms (except for the Red Hat platform family, which defaults to { restart: false, reload: false, status: true }.)",
-               coerce: proc { |x| x.is_a?(Array) ? x.each_with_object({}) { |i, m| m[i] = true } : x }
+               coerce: proc { |x| x.is_a?(Array) ? x.to_h { |i| [i, true] } : x }
 
       property :service_name, String,
         description: "An optional property to set the service name if it differs from the resource block's name.",

data/lib/chef/resource/sysctl.rb

@@ -140,11 +140,11 @@ class Chef
           directory new_resource.conf_dir
 
           file "#{new_resource.conf_dir}/99-chef-#{new_resource.key.tr("/", ".")}.conf" do
-            content contruct_sysctl_content
+            content construct_sysctl_content
           end
 
           execute "Load sysctl values" do
-            command "sysctl #{"-e " if new_resource.ignore_error}-p"
+            command sysctl_reload_command
             default_env true
             action :run
           end
@@ -161,7 +161,7 @@ class Chef
 
             execute "Load sysctl values" do
               default_env true
-              command "sysctl -p"
+              command sysctl_reload_command
               action :run
             end
           end
@@ -179,12 +179,29 @@ class Chef
           shell_out!("sysctl #{"-e " if new_resource.ignore_error}-w \"#{key}=#{value}\"")
         end
 
+        #
+        # The command used to reload sysctl settings from disk.
+        #
+        # `sysctl -p` only reads /etc/sysctl.conf (or an explicit file), which
+        # some distros (e.g. Debian 13 "trixie") no longer ship by default, since
+        # they rely entirely on systemd-sysctl loading /etc/sysctl.d/*.conf.
+        # `sysctl --system` reloads from all of the standard locations --
+        # including the conf_dir this resource writes to -- and simply skips
+        # /etc/sysctl.conf if it doesn't exist, so it works whether or not that
+        # file is present.
+        #
+        # @return [String] The sysctl reload command
+        #
+        def sysctl_reload_command
+          "sysctl #{"-e " if new_resource.ignore_error}--system"
+        end
+
         #
         # construct a string, joining members of new_resource.comment and new_resource.value
         #
         # @return [String] The text file content
         #
-        def contruct_sysctl_content
+        def construct_sysctl_content
           sysctl_lines = Array(new_resource.comment).map { |c| "# #{c.strip}" }
 
           sysctl_lines << "#{new_resource.key} = #{new_resource.value}"
@@ -219,7 +236,7 @@ class Chef
       def get_sysctld_value(key)
         raise unless ::TargetIO::File.exist?("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf")
 
-        k, v = ::Target_IO::File.read("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf").match(/(.*) = (.*)/).captures
+        k, v = ::TargetIO::File.read("/etc/sysctl.d/99-chef-#{key.tr("/", ".")}.conf").match(/(.*) = (.*)/).captures
         raise "Unknown sysctl key!" if k.nil?
         raise "Unknown sysctl value!" if v.nil?
 

data/lib/chef/resource/windows_ad_join.rb

@@ -65,7 +65,7 @@ class Chef
         description: "The domain user that will be used to join the domain.",
         required: true
 
-      property :domain_password, String,
+      property :domain_password, String, sensitive: true,
         description: "The password for the domain user. Note that this resource is set to hide sensitive information by default. ",
         required: true
 

data/lib/chef/resource/windows_certificate.rb

@@ -65,7 +65,7 @@ class Chef
         description: "The source file (for `create` and `acl_add`), thumbprint (for `delete`, `export`, and `acl_add`), or subject (for `delete` or `export`) if it differs from the resource block's name.",
         name_property: true
 
-      property :pfx_password, String,
+      property :pfx_password, String, sensitive: true,
         description: "The password to access the object with if it is a PFX file."
 
       property :private_key_acl, Array,

data/lib/chef/resource/windows_security_policy.rb

@@ -137,7 +137,6 @@ class Chef
       def load_security_options
         powershell_code = <<-CODE
           C:\\Windows\\System32\\secedit /export /cfg $env:TEMP\\secopts_export.inf | Out-Null
-          # cspell:disable-next-line
           $security_options_data = (Get-Content $env:TEMP\\secopts_export.inf | Select-String -Pattern "^[CEFLMNPR].* =.*$" | Out-String)
           Remove-Item $env:TEMP\\secopts_export.inf -force
           $security_options_hash = ($security_options_data -Replace '"'| ConvertFrom-StringData)

data/lib/chef/resource/windows_service.rb

@@ -228,7 +228,7 @@ class Chef
         default: "localsystem",
         coerce: proc(&:downcase)
 
-      property :run_as_password, String,
+      property :run_as_password, String, sensitive: true,
         description: "The password for the user specified by `run_as_user`.",
         default: ""
     end

data/lib/chef/resource/windows_task.rb

@@ -164,7 +164,7 @@ class Chef
         default: lazy { Chef::ReservedNames::Win32::Security::SID.LocalSystem.account_simple_name if ChefUtils.windows_ruby? },
         default_description: "The localized SYSTEM user for the node."
 
-      property :password, String,
+      property :password, String, sensitive: true,
         description: "The user's password. The user property must be set if using this property."
 
       property :run_level, Symbol, equal_to: %i{highest limited},
@@ -523,7 +523,6 @@ class Chef
             6 => ::Win32::TaskScheduler::TASK_SIXTH,
             7 => ::Win32::TaskScheduler::TASK_SEVENTH,
             8 => ::Win32::TaskScheduler::TASK_EIGHTH,
-            # cspell:disable-next-line
             9 => ::Win32::TaskScheduler::TASK_NINETH,
             10 => ::Win32::TaskScheduler::TASK_TENTH,
             11 => ::Win32::TaskScheduler::TASK_ELEVENTH,
@@ -545,7 +544,6 @@ class Chef
             27 => ::Win32::TaskScheduler::TASK_TWENTY_SEVENTH,
             28 => ::Win32::TaskScheduler::TASK_TWENTY_EIGHTH,
             29 => ::Win32::TaskScheduler::TASK_TWENTY_NINTH,
-            # cspell:disable-next-line
             30 => ::Win32::TaskScheduler::TASK_THIRTYETH,
             31 => ::Win32::TaskScheduler::TASK_THIRTY_FIRST,
           }.freeze

data/lib/chef/resource/windows_update_settings.rb

@@ -144,38 +144,25 @@ class Chef
       action :set, description: "Set Windows Update settings." do
         actual_day = convert_day(new_resource.scheduled_install_day)
 
+        windows_update_values = [{
+          name: "DisableOSUpgrade",
+          type: :dword,
+          data: new_resource.disable_os_upgrades ? 1 : 0,
+        },
+        {
+          name: "ElevateNonAdmins",
+          type: :dword,
+          data: new_resource.elevate_non_admins ? 1 : 0,
+        },
+        {
+          name: "TargetGroupEnabled",
+          type: :dword,
+          data: new_resource.target_wsus_group_name ? 1 : 0,
+        }] + wsus_registry_values
+
         registry_key "HKEY_LOCAL_MACHINE\\Software\\Policies\\Microsoft\\Windows\\WindowsUpdate" do
           recursive true
-          values [{
-            name: "DisableOSUpgrade",
-            type: :dword,
-            data: new_resource.disable_os_upgrades ? 1 : 0,
-          },
-          {
-            name: "ElevateNonAdmins",
-            type: :dword,
-            data: new_resource.elevate_non_admins ? 1 : 0,
-          },
-          {
-            name: "TargetGroupEnabled",
-            type: :dword,
-            data: new_resource.target_wsus_group_name ? 1 : 0,
-          },
-          {
-            name: "TargetGroup",
-            type: :string,
-            data: new_resource.target_wsus_group_name,
-          },
-          {
-            name: "WUServer",
-            type: :string,
-            data: new_resource.wsus_server_url,
-          },
-          {
-            name: "WUStatusServer",
-            type: :string,
-            data: new_resource.wsus_server_url, # status server and server need to be the same. Why? Ask Microsoft
-          }]
+          values windows_update_values
           action :create
         end
 
@@ -250,6 +237,40 @@ class Chef
           DAYS.index(day)
         end
 
+        # The WSUS registry values are only meaningful once a WSUS server or
+        # target group has been configured. Emitting them with nil data makes
+        # registry_key rewrite them on every run, so leave them out entirely
+        # when the matching property is unset.
+        #
+        # @return [Array<Hash>]
+        def wsus_registry_values
+          values = []
+
+          if new_resource.target_wsus_group_name
+            values << {
+              name: "TargetGroup",
+              type: :string,
+              data: new_resource.target_wsus_group_name,
+            }
+          end
+
+          if new_resource.wsus_server_url
+            values << {
+              name: "WUServer",
+              type: :string,
+              data: new_resource.wsus_server_url,
+            }
+            values << {
+              name: "WUStatusServer",
+              type: :string,
+              # status server and server need to be the same. Why? Ask Microsoft
+              data: new_resource.wsus_server_url,
+            }
+          end
+
+          values
+        end
+
         # support the old name as well
         alias_method :action_enable, :action_set
       end

data/lib/chef/resource/yum_package.rb

@@ -139,7 +139,7 @@ class Chef
           if v.is_a?(Hash)
             v
           elsif v.is_a?(Array)
-            v.each_with_object({}) { |arg, obj| obj[arg] = true }
+            v.to_h { |arg| [arg, true] }
           elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
             { before: v, after: v }
           elsif v == :before

data/lib/chef/resource/yum_repository.rb

@@ -147,14 +147,14 @@ class Chef
       property :options, Hash,
         description: "Specifies the repository options."
 
-      property :password, String,
+      property :password, String, sensitive: true,
         description: "Password to use with the username for basic authentication."
 
       property :priority, String, regex: /^(\d?[1-9]|[0-9][0-9])$/,
                description: "Assigns a priority to a repository where the priority value is between `1` and `99` inclusive. Priorities are used to enforce ordered protection of repositories. Packages from repositories with a lower priority (higher numerical value) will never be used to upgrade packages that were installed from a repository with a higher priority (lower numerical value). The repositories with the lowest numerical priority number have the highest priority.",
                validation_message: "The priority property must be a numeric value from 1-99!"
 
-      property :proxy_password, String,
+      property :proxy_password, String, sensitive: true,
         description: "Password for this proxy."
 
       property :proxy_username, String,

data/lib/chef/resource.rb

@@ -625,10 +625,10 @@ class Chef
     end
 
     def with_umask
-      old_value = ::File.umask(umask.oct) if umask
+      old_value = ::File.umask((umask.respond_to?(:oct) ? umask.oct : umask.to_i) & 0777) if umask
       yield
     ensure
-      ::File.umask(old_value) if umask
+      ::File.umask(old_value) if old_value
     end
 
     #

data/lib/chef/resource_inspector.rb

@@ -122,7 +122,7 @@ class Chef
     # @return [String] JSON formatting of all resources
     def self.inspect(arguments = [], complete: false)
       output = if arguments.empty?
-                 ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.each_with_object({}) { |klass, acc| acc[klass.resource_name] = extract_resource(klass) }
+                 ObjectSpace.each_object(Class).select { |k| k < Chef::Resource }.to_h { |klass| [klass.resource_name, extract_resource(klass)] }
                else
                  Array(arguments).each_with_object({}) do |arg, acc|
                    if File.directory?(arg)

data/lib/chef/role.rb

@@ -141,7 +141,7 @@ class Chef
         "override_attributes" => @override_attributes,
         "chef_type" => "role",
 
-        # Render to_json correctly for run_list items (both run_list and evn_run_lists)
+        # Render to_json correctly for run_list items (both run_list and env_run_lists)
         # so malformed json does not result
         "run_list" => run_list.run_list.map(&:to_s),
         "env_run_lists" => env_run_lists_without_default.inject({}) do |accumulator, (k, v)|

data/lib/chef/target_io/train/dir.rb

@@ -73,8 +73,17 @@ module TargetIO
           path
         end
 
+        # Resolve the temp directory on the *target*, not the local host running
+        # chef-client. Using ::Dir.tmpdir here would return the host's tmp dir
+        # (e.g. macOS's /var/folders/...), which does not exist on the remote
+        # target and causes staging operations (mkdir/cp over the transport) to
+        # silently fail when host and target have different tmp dir conventions.
         def tmpdir
-          ::Dir.tmpdir
+          result = run_command(%q{printf '%s' "${TMPDIR:-${TMP:-${TEMP:-/tmp}}}"})
+          dir = result.stdout.to_s.strip
+          dir.empty? ? "/tmp" : dir
+        rescue StandardError
+          "/tmp"
         end
 
         def unlink(dir_name)

data/lib/chef/target_io/train/fileutils.rb

@@ -16,7 +16,7 @@ module TargetIO
         end
 
         def chmod_R(mode, list, noop: nil, verbose: nil, force: nil)
-          cmd = sprintf("chmod -R%s %s %s", (force ? "f" : ""), mode_to_s(mode), Array(list).join(" "))
+          cmd = sprintf("chmod -R%s %s %s", (force ? "f" : ""), __mode_to_s(mode), Array(list).join(" "))
 
           Chef::Log.debug cmd if verbose
           return if noop

data/lib/chef/util/selinux.rb

@@ -48,8 +48,8 @@ class Chef
 
       def restore_security_context(file_path, recursive = false)
         if restorecon_path
-          restorecon_flags = [ "-R" ]
-          restorecon_flags << "-r" if recursive
+          restorecon_flags = []
+          restorecon_flags << "-R" if recursive
           restorecon_flags << file_path
           Chef::Log.trace("Restoring selinux security content with #{restorecon_path}")
           shell_out!(restorecon_path, restorecon_flags)

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("19.3.15")
+  VERSION = Chef::VersionString.new("19.4.46")
 end
 
 #

data/lib/chef/win32/api/command_line_helper.rb

@@ -73,8 +73,8 @@ HLOCAL LocalFree(
           result = command_line_to_argv_w(argv, argc)
           str_ptr = result.read_pointer
           offset = 0
-          number_of_agrs = argc.read_int
-          number_of_agrs.times do
+          number_of_args = argc.read_int
+          number_of_args.times do
             new_str_pointer = str_ptr.+(offset)
             argument = new_str_pointer.read_wstring
             arguments_list << argument

data/lib/chef/win32/api/error.rb

@@ -90,7 +90,6 @@ class Chef
         ERROR_TOO_MANY_NAMES      = 68
         ERROR_TOO_MANY_SESS       = 69
         ERROR_SHARING_PAUSED      = 70
-        # cspell:disable-next-line
         ERROR_REQ_NOT_ACCEP       = 71
         ERROR_REDIR_PAUSED        = 72
 
@@ -877,7 +876,6 @@ class Chef
 
         # Flags for LoadLibraryEx
 
-        # cspell:disable-next-line
         DONT_RESOLVE_DLL_REFERENCES = 0x00000001
         LOAD_IGNORE_CODE_AUTHZ_LEVEL = 0x00000010
         LOAD_LIBRARY_AS_DATAFILE = 0x00000002

data/lib/chef/win32/api/net.rb

@@ -39,7 +39,6 @@ class Chef
         UF_ACCOUNTDISABLE      = 0x000002
         UF_PASSWD_CANT_CHANGE  = 0x000040
         UF_NORMAL_ACCOUNT      = 0x000200
-        # cspell:disable-next-line
         UF_DONT_EXPIRE_PASSWD  = 0x010000
 
         USE_NOFORCE = 0
@@ -84,9 +83,8 @@ class Chef
           end
 
           def as_ruby
-            members.inject({}) do |memo, key|
-              memo[key] = get(key)
-              memo
+            members.to_h do |key|
+              [key, get(key)]
             end
           end
         end

data/lib/chef/win32/api.rb

@@ -125,11 +125,11 @@ class Chef
         # perform pointer arithmetic. BaseTsd.h:
         # if defined(_WIN64) host.typedef __int64 LONG_PTR; #else host.typedef long LONG_PTR;
         if win64
-          host.typedef :int64,    :LONG_PTR # Signed long type for pointer precision. Use when casting a pointer to a long to
-          host.typedef :int64,    :LPARAM # Message parameter. WinDef.h as follows: #host.typedef LONG_PTR LPARAM;
+          host.typedef :int64, :LONG_PTR # Signed long type for pointer precision. Use when casting a pointer to a long to
+          host.typedef :int64, :LPARAM # Message parameter. WinDef.h as follows: #host.typedef LONG_PTR LPARAM;
         else
-          host.typedef :long,    :LONG_PTR # Signed long type for pointer precision. Use when casting a pointer to a long to
-          host.typedef :long,    :LPARAM # Message parameter. WinDef.h as follows: #host.typedef LONG_PTR LPARAM;
+          host.typedef :long, :LONG_PTR # Signed long type for pointer precision. Use when casting a pointer to a long to
+          host.typedef :long, :LPARAM # Message parameter. WinDef.h as follows: #host.typedef LONG_PTR LPARAM;
         end
         host.typedef :pointer, :LPBOOL # Pointer to a BOOL. WinDef.h as follows: #host.typedef BOOL far *LPBOOL;
         host.typedef :pointer, :LPBYTE # Pointer to a BYTE. WinDef.h as follows: #host.typedef BYTE far *LPBYTE;

data/lib/chef/win32/net.rb

@@ -40,7 +40,6 @@ class Chef
             usri3_priv: 0,
             usri3_home_dir: nil,
             usri3_comment: nil,
-            # cspell:disable-next-line
             usri3_flags: UF_SCRIPT | UF_DONT_EXPIRE_PASSWD | UF_NORMAL_ACCOUNT,
             usri3_script_path: nil,
             usri3_auth_flags: 0,

data/lib/chef/win32/security/acl.rb

@@ -89,7 +89,7 @@ class Chef
         end
 
         def to_s
-          "[#{collect(&:to_s).join(", ")}]"
+          "[#{collect(&:to_s).join(", ")}]" # rubocop:disable Style/MapJoin
         end
 
         def self.align_dword(size)

data/lib/chef/win32/security.rb

@@ -621,7 +621,7 @@ class Chef
         result.read_long
       end
 
-      def set_security_descriptor_dacl(security_descriptor, acl, defaulted = false, present = nil)
+      def self.set_security_descriptor_dacl(security_descriptor, acl, defaulted = false, present = nil)
         security_descriptor = security_descriptor.pointer if security_descriptor.respond_to?(:pointer)
         acl = acl.pointer if acl.respond_to?(:pointer)
         present = !security_descriptor.null? if present.nil?