chef 18.9.4 → 18.10.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1de7dd02696d84d680c3851565ec4837ca0275cc4cc153d39bde72eea4f2be
-  data.tar.gz: 5e8ac13c389d7e024108b626f935d11c092a120fd857ac5200fc13fafcc1a5d2
+  metadata.gz: ea642da5a95174bc30b1f2010f05945c9a7847e1082f88c415bf5d9807f39227
+  data.tar.gz: 0edf60effa635270d37059fd3e315d77cd97f852fce7547569fae96b13ccaf4c
 SHA512:
-  metadata.gz: cc96321c5e4d51febea1aec696accb358d3219a31e142c00b5c7255501682f98f098de20ae2e720ac9fbb4c13991a3692614262585ed4dde34ce2b2eb7830bb7
-  data.tar.gz: 8d35f965f1f382983b098dce2a7302684cd2273523ea03b07a1a66c5183f70bda24bcabfd4056c8c9bc7ca5eeb7c698ed92e70826703e760b5927b4a06af1055
+  metadata.gz: 29095f460f5a93f61dfc67cb21a76bdedd4ceb154a347583424b1d07d7f23e707cafd6a28677d81b2d9753eed323fc78ae8474027d86fb3fee9f7d3910560997
+  data.tar.gz: f1f1869359071735d971e79faa2f2a5a0ab11ddad463c278ae1ff47a0b80db4e1c202d71ff7e10b7c6a761e45cb1c79b958ae3bbd0f02dec8901240c178cffa2

data/Gemfile

@@ -64,11 +64,7 @@ group(:development, :test) do
   gem "fauxhai-ng" # for chef-utils gem
 end
 
-gem "chefstyle"
-# group(:chefstyle) do
-#   # for testing new chefstyle rules
-#   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main"
-# end
+gem "cookstyle", "~> 8.6"
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 

data/Rakefile

@@ -100,12 +100,28 @@ task :register_eventlog do
   end
 end
 
-begin
-  require "chefstyle"
+desc "Check Linting and code style."
+task :style do
   require "rubocop/rake_task"
-  RuboCop::RakeTask.new(:style) do |task|
-    task.options += ["--display-cop-names", "--no-color"]
+  require "cookstyle/chefstyle"
+
+  if RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+    # Windows-specific command, rubocop erroneously reports the CRLF in each file which is removed when your PR is uploaded to GitHub.
+    # This is a workaround to ignore the CRLF from the files before running cookstyle.
+    sh "cookstyle --chefstyle -c .rubocop.yml --except Layout/EndOfLine"
+  else
+    sh "cookstyle --chefstyle -c .rubocop.yml"
   end
 rescue LoadError
-  puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
+  puts "Rubocop or Cookstyle gems are not installed. bundle install first to make sure all dependencies are installed."
 end
+
+# begin
+#   require "chefstyle"
+#   require "rubocop/rake_task"
+#   RuboCop::RakeTask.new(:style) do |task|
+#     task.options += ["--display-cop-names", "--no-color"]
+#   end
+# rescue LoadError
+#   puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
+# end

data/chef.gemspec

@@ -1,6 +1,6 @@
 # on Windows, the directory location starts with "(eval at " because it's
 # being evaled in
-file_directory = File.dirname(__FILE__).gsub(/\(eval at /, "")
+file_directory = File.dirname(__FILE__).gsub("(eval at ", "")
 $:.unshift(File.join(file_directory, "lib"))
 vs_path = File.expand_path("chef-utils/lib/chef-utils/version_string.rb", __dir__)
 
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
   s.add_dependency "train-core", "~> 3.13", ">= 3.13.4"
-  s.add_dependency "train-winrm", "~> 0.2.17"
+  s.add_dependency "train-winrm", "~> 0.4.0"
   s.add_dependency "train-rest", ">= 0.4.1" # target mode with rest APIs
 
   s.add_dependency "license-acceptance", ">= 1.0.5", "< 3"
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
   s.add_dependency "syslog-logger", "~> 1.6"
   s.add_dependency "uuidtools", ">= 2.1.5", "< 3.0" # osx_profile resource
   s.add_dependency "unf_ext", "~> 0.0.8.2" # older platforms
-  s.add_dependency "uri", "~> 1.0.3" # This is used by net-http. We are forcing a version to get past a CVE in 1.0.2
+  s.add_dependency "uri", "~> 1.0.4" # This is used by net-http. We are forcing a version to get past a CVE in 1.0.2
   s.add_dependency "corefoundation", "~> 0.3.4" # macos_userdefaults resource
 
   s.add_dependency "proxifier2", "~> 1.1"

data/lib/chef/application/apply.rb

@@ -75,7 +75,7 @@ class Chef::Application::Apply < Chef::Application
     short: "-l LEVEL",
     long: "--log_level LEVEL",
     description: "Set the log level (trace, debug, info, warn, error, fatal).",
-    proc: lambda { |l| l.to_sym }
+    proc: lambda(&:to_sym)
 
   option :log_location_cli,
     short: "-L LOGLOCATION",

data/lib/chef/application/base.rb

@@ -96,7 +96,7 @@ class Chef::Application::Base < Chef::Application
     short: "-l LEVEL",
     long: "--log_level LEVEL",
     description: "Set the log level (auto, trace, debug, info, warn, error, fatal).",
-    proc: lambda { |l| l.to_sym }
+    proc: lambda(&:to_sym)
 
   option :log_location_cli,
     short: "-L LOGLOCATION",
@@ -139,7 +139,7 @@ class Chef::Application::Base < Chef::Application
     short: "-i SECONDS",
     long: "--interval SECONDS",
     description: "Run #{ChefUtils::Dist::Infra::PRODUCT} periodically, in seconds.",
-    proc: lambda { |s| s.to_i }
+    proc: lambda(&:to_i)
 
   option :json_attribs,
     short: "-j JSON_ATTRIBS",
@@ -157,7 +157,7 @@ class Chef::Application::Base < Chef::Application
     short: "-s SECONDS",
     long: "--splay SECONDS",
     description: "The splay time for running at intervals, in seconds.",
-    proc: lambda { |s| s.to_i }
+    proc: lambda(&:to_i)
 
   option :environment,
     short: "-E ENVIRONMENT",
@@ -189,7 +189,7 @@ class Chef::Application::Base < Chef::Application
   option :run_lock_timeout,
     long: "--run-lock-timeout SECONDS",
     description: "Set maximum duration to wait for another client run to finish, default is indefinitely.",
-    proc: lambda { |s| s.to_i }
+    proc: lambda(&:to_i)
 
   option :version,
     short: "-v",

data/lib/chef/application/exit_code.rb

@@ -141,7 +141,7 @@ class Chef
         def non_standard_exit_code_warning(exit_code)
           "#{ChefUtils::Dist::Infra::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
           " The #{ChefUtils::Dist::Infra::PRODUCT} Exit Codes design document (https://github.com/chef/chef/blob/main/docs/dev/design_documents/client_exit_codes.md)" \
-          " defines the exit codes that should be used with #{ChefUtils::Dist::Infra::CLIENT}. Chef::Application::ExitCode defines"  \
+          " defines the exit codes that should be used with #{ChefUtils::Dist::Infra::CLIENT}. Chef::Application::ExitCode defines" \
           " valid exit codes Non-standard exit codes are redefined as GENERIC_FAILURE."
         end
 

data/lib/chef/chef_fs/command_line.rb

@@ -29,7 +29,7 @@ class Chef
 
       def self.diff_print(pattern, a_root, b_root, recurse_depth, output_mode, format_path = nil, diff_filter = nil, ui = nil)
         if format_path.nil?
-          format_path = proc { |entry| entry.path_for_printing }
+          format_path = proc(&:path_for_printing)
         end
 
         get_content = (output_mode != :name_only && output_mode != :name_status)
@@ -119,9 +119,9 @@ class Chef
               yield result
             end
 
-          when :both_nonexistent
-          when :added_cannot_upload
-          when :deleted_cannot_download
+          when :both_nonexistent # rubocop:disable Lint/EmptyWhen
+          when :added_cannot_upload # rubocop:disable Lint/EmptyWhen
+          when :deleted_cannot_download # rubocop:disable Lint/EmptyWhen
           when :same
             # Skip these silently
           when :error

data/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb

@@ -91,7 +91,7 @@ class Chef
                     end
                   end
                   # Create the file itself
-                  container.add_child(CookbookFile.new(parts[parts.length - 1], container, file))
+                  container.add_child(CookbookFile.new(parts[-1], container, file))
                 end
               end
               @children = @children.sort_by(&:name)

data/lib/chef/chef_fs/file_system/chef_server/cookbooks_dir.rb

@@ -80,9 +80,8 @@ class Chef
                 tmp_cl.load_cookbooks
                 tmp_cl.compile_metadata
                 tmp_cl.freeze_versions if options[:freeze]
-                cookbook_for_upload = []
-                tmp_cl.each do |cookbook_name, cookbook|
-                  cookbook_for_upload << cookbook
+                cookbook_for_upload = tmp_cl.map do |cookbook_name, cookbook|
+                  cookbook
                 end
 
                 uploader = Chef::CookbookUploader.new(cookbook_for_upload, force: options[:force], rest: chef_rest)

data/lib/chef/client.rb

@@ -385,7 +385,7 @@ class Chef
     # @api private
     def rest
       @rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url], client_name: node_name,
-                                    signing_key_filename: Chef::Config[:client_key])
+        signing_key_filename: Chef::Config[:client_key])
     end
 
     # A rest object with validate_utf8 set to false.  This will not throw exceptions
@@ -397,7 +397,7 @@ class Chef
     def rest_clean
       @rest_clean ||=
         Chef::ServerAPI.new(Chef::Config[:chef_server_url], client_name: node_name,
-                            signing_key_filename: Chef::Config[:client_key], validate_utf8: false)
+          signing_key_filename: Chef::Config[:client_key], validate_utf8: false)
     end
 
     #
@@ -1090,4 +1090,3 @@ end
 require_relative "cookbook_loader"
 require_relative "cookbook_version"
 require_relative "cookbook/synchronizer"
-

data/lib/chef/compliance/fetcher/chef_server.rb

@@ -125,7 +125,7 @@ class Chef
         private
 
         def chef_server_url
-          m = %r{^#{@config['server']}/owners/(?<owner>[^/]+)/compliance/(?<id>[^/]+)/tar$}.match(@target)
+          m = %r{^#{@config["server"]}/owners/(?<owner>[^/]+)/compliance/(?<id>[^/]+)/tar$}.match(@target)
           "#{m[:owner]}/#{m[:id]}"
         end
       end

data/lib/chef/compliance/reporter/cli.rb

@@ -46,11 +46,11 @@ class Chef
             end
             if result[:message]
               if found
-                result[:message].split(/\n/).reject(&:empty?).each do |m|
+                result[:message].split("\n").reject(&:empty?).each do |m|
                   output << pastel.red("#{" " * 12}#{m}")
                 end
               else
-                result[:message].split(/\n/).reject(&:empty?).each do |m|
+                result[:message].split("\n").reject(&:empty?).each do |m|
                   output << pastel.red("#{" " * 9}#{m}")
                 end
               end

data/lib/chef/dsl/chef_vault.rb

@@ -81,4 +81,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/encrypted_data_bag_item/decryptor.rb

@@ -177,11 +177,7 @@ class Chef::EncryptedDataBagItem
         digest = OpenSSL::Digest.new("sha256")
         raw_hmac = OpenSSL::HMAC.digest(digest, key, @encrypted_data["encrypted_data"])
 
-        if candidate_hmac_matches?(raw_hmac)
-          true
-        else
-          raise DecryptionFailure, "Error decrypting data bag value: invalid hmac. Most likely the provided key is incorrect"
-        end
+        candidate_hmac_matches?(raw_hmac) || raise(DecryptionFailure, "Error decrypting data bag value: invalid hmac. Most likely the provided key is incorrect")
       end
 
       private

data/lib/chef/environment.rb

@@ -35,7 +35,7 @@ class Chef
     include Chef::Mixin::ParamsValidate
     include Chef::Mixin::FromFile
 
-    COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:\s+)((?:#{Chef::VersionConstraint::OPS.join('|')})(?:\s+).+)$/.freeze
+    COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:\s+)((?:#{Chef::VersionConstraint::OPS.join("|")})(?:\s+).+)$/.freeze
 
     def initialize(chef_server_rest: nil)
       @name = ""

data/lib/chef/exceptions.rb

@@ -532,7 +532,7 @@ class Chef
         @resources_found = resources_found
         matches_info = @resources_found.each do |r|
           if r["Module"].nil?
-            "Resource #{r["Name"]} was found in #{r["Module"]["Name"]}"
+            "Resource #{r["Name"]} was found in #{r["Module"]["Name"]}" # rubocop:disable Lint/Void
           else
             "Resource #{r["Name"]} is a binary resource"
           end

data/lib/chef/file_cache.rb

@@ -201,11 +201,7 @@ class Chef
           }
         )
         full_path = create_cache_path(path, false)
-        if File.exist?(full_path)
-          true
-        else
-          false
-        end
+        File.exist?(full_path) || false
       end
 
       alias_method :has_key?, :key?

data/lib/chef/formatters/error_inspectors/compile_error_inspector.rb

@@ -126,7 +126,7 @@ class Chef
         end
 
         def filtered_bt
-          backtrace_lines_in_cookbooks.count > 0 ? backtrace_lines_in_cookbooks : exception.backtrace
+          backtrace_lines_in_cookbooks.any? ? backtrace_lines_in_cookbooks : exception.backtrace
         end
 
         def found_error_in_cookbooks?

data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb

@@ -69,7 +69,7 @@ class Chef
             describe_412_error(error_description)
           when Net::HTTPBadRequest
             describe_400_error(error_description)
-          when Net::HTTPNotFound
+          when Net::HTTPNotFound # rubocop:disable Lint/EmptyWhen
           when Net::HTTPInternalServerError
             describe_500_error(error_description)
           when Net::HTTPBadGateway, Net::HTTPServiceUnavailable

data/lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb

@@ -64,7 +64,7 @@ class Chef
             describe_401_error(error_description)
           when Net::HTTPBadRequest
             describe_400_error(error_description)
-          when Net::HTTPNotFound
+          when Net::HTTPNotFound # rubocop:disable Lint/EmptyWhen
           when Net::HTTPInternalServerError
             describe_500_error(error_description)
           when Net::HTTPBadGateway, Net::HTTPServiceUnavailable, Net::HTTPGatewayTimeOut

data/lib/chef/group.rb

@@ -35,7 +35,7 @@ class Chef
       body_hash = {
         groupname: "#{groupname}",
         actors: {
-          "users" => group["actors"].concat([username]),
+          "users" => group["actors"].push(username),
           "groups" => group["groups"],
         },
       }

data/lib/chef/handler/slow_report.rb

@@ -54,7 +54,7 @@ class Chef
 
       def count
         num = all_resources.count
-        num > amount ? amount : num
+        [num, amount].min
       end
 
       def stripped_source_line(resource)

data/lib/chef/http/authenticator.rb

@@ -335,15 +335,15 @@ class Chef
       def self.get_the_key_ps(client_name, password)
         store = get_cert_user
         powershell_code = <<~CODE
-            Try {
-              $my_pwd = ConvertTo-SecureString -String "#{password}" -Force -AsPlainText;
-              $cert = Get-ChildItem -path cert:\\#{store}\\My -Recurse | Where-Object { $_.Subject -match "chef-#{client_name}$" } -ErrorAction Stop;
-              $tempfile = [System.IO.Path]::GetTempPath() + "export_pfx.pfx";
-              Export-PfxCertificate -Cert $cert -Password $my_pwd -FilePath $tempfile;
-            }
-            Catch {
-              return $false
-            }
+          Try {
+            $my_pwd = ConvertTo-SecureString -String "#{password}" -Force -AsPlainText;
+            $cert = Get-ChildItem -path cert:\\#{store}\\My -Recurse | Where-Object { $_.Subject -match "chef-#{client_name}$" } -ErrorAction Stop;
+            $tempfile = [System.IO.Path]::GetTempPath() + "export_pfx.pfx";
+            Export-PfxCertificate -Cert $cert -Password $my_pwd -FilePath $tempfile;
+          }
+          Catch {
+            return $false
+          }
         CODE
       end
 

data/lib/chef/mixin/api_version_request_handling.rb

@@ -42,7 +42,7 @@ class Chef
         max_server_version = Integer(header["max_version"])
 
         supported_client_versions.each do |version|
-          if version >= min_server_version && version <= max_server_version
+          if version.between?(min_server_version, max_server_version)
             server_supported_client_versions.push(version)
           end
         end

data/lib/chef/mixin/powershell_type_coercions.rb

@@ -72,8 +72,8 @@ class Chef
         # do we need to worry about binary data?
         if unsafe?(s)
           encoded_str = Base64.strict_encode64(s.encode("UTF-8"))
-          "([System.Text.Encoding]::UTF8.GetString("\
-               "[System.Convert]::FromBase64String('#{encoded_str}')"\
+          "([System.Text.Encoding]::UTF8.GetString(" \
+               "[System.Convert]::FromBase64String('#{encoded_str}')" \
           "))"
         else
           "'#{s}'"

data/lib/chef/mixin/securable.rb

@@ -50,9 +50,9 @@ class Chef
 
               # Windows does not support the sticky or setuid bits
               if ChefUtils.windows?
-                Integer(m) <= 0777 && Integer(m) >= 0
+                Integer(m).between?(0, 0777)
               else
-                Integer(m) <= 07777 && Integer(m) >= 0
+                Integer(m).between?(0, 07777)
               end
             end,
           }

data/lib/chef/mixin/template.rb

@@ -238,7 +238,7 @@ class Chef
 
         def source_listing
           @source_listing ||= begin
-            lines = @template.split(/\n/)
+            lines = @template.split("\n")
             if line_number
               line_index = line_number - 1
               beginning_line = line_index <= SOURCE_CONTEXT_WINDOW ? 0 : line_index - SOURCE_CONTEXT_WINDOW

data/lib/chef/mixin/versioned_api.rb

@@ -48,7 +48,7 @@ class Chef
           version = klass.send(:minimum_api_version)
           # min and max versions will be nil if we've not made a request to the server yet,
           # in which case we'll just start with the highest version and see what happens
-          ServerAPIVersions.instance.min_server_version.nil? || (version >= ServerAPIVersions.instance.min_server_version && version <= ServerAPIVersions.instance.send(type))
+          ServerAPIVersions.instance.min_server_version.nil? || (version.between?(ServerAPIVersions.instance.min_server_version, ServerAPIVersions.instance.send(type)))
         end
           .max_by { |a| a.send(:minimum_api_version) }
       end

data/lib/chef/monkey_patches/net-http.rb

@@ -37,9 +37,9 @@ if RUBY_VERSION.split(".")[0..1].join(".") == "3.1"
         if use_ssl?
           if proxy?
             plain_sock = BufferedIO.new(s, read_timeout: @read_timeout,
-                                        write_timeout: @write_timeout,
-                                        continue_timeout: @continue_timeout,
-                                        debug_output: @debug_output)
+              write_timeout: @write_timeout,
+              continue_timeout: @continue_timeout,
+              debug_output: @debug_output)
             buf = "CONNECT #{conn_address}:#{@port} HTTP/#{HTTPVersion}\r\n"
             buf << "Host: #{@address}:#{@port}\r\n"
             if proxy_user
@@ -65,8 +65,8 @@ if RUBY_VERSION.split(".")[0..1].join(".") == "3.1"
           @ssl_context.set_params(ssl_parameters)
           unless @ssl_context.session_cache_mode.nil? # a dummy method on JRuby
             @ssl_context.session_cache_mode =
-                OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
-                OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
+              OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
+              OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
           end
           if @ssl_context.respond_to?(:session_new_cb) # not implemented under JRuby
             @ssl_context.session_new_cb = proc { |sock, sess| @ssl_session = sess }
@@ -108,9 +108,9 @@ if RUBY_VERSION.split(".")[0..1].join(".") == "3.1"
           Chef::Log.debug("SSL established, protocol: #{s.ssl_version}, cipher: #{s.cipher[0]}")
         end
         @socket = BufferedIO.new(s, read_timeout: @read_timeout,
-                                write_timeout: @write_timeout,
-                                continue_timeout: @continue_timeout,
-                                debug_output: @debug_output)
+          write_timeout: @write_timeout,
+          continue_timeout: @continue_timeout,
+          debug_output: @debug_output)
         @last_communicated = nil
         on_connect
       rescue => exception

data/lib/chef/property.rb

@@ -698,7 +698,7 @@ class Chef
       # Weeding out class methods avoids unnecessary deprecations such Chef::Resource
       # defining a `name` property when there's an already-existing `name` method
       # for a Module.
-      return false unless declared_in.instance_methods.include?(name)
+      return false unless declared_in.method_defined?(name)
 
       # Only emit deprecations for some well-known classes. This will still
       # allow more advanced users to subclass their own custom resources and

data/lib/chef/provider/cron.rb

@@ -27,7 +27,7 @@ class Chef
       SPECIAL_TIME_VALUES = %i{reboot yearly annually monthly weekly daily midnight hourly}.freeze
       CRON_ATTRIBUTES = %i{minute hour day month weekday time command mailto path shell home environment}.freeze
       CRON_PATTERN = %r{\A([-0-9*,/]+)\s([-0-9*,/]+)\s([-0-9*,/]+)\s([-0-9*,/]+|[a-zA-Z]{3})\s([-0-9*,/]+|[a-zA-Z]{3})\s(.*)}.freeze
-      SPECIAL_PATTERN = /\A(@(#{SPECIAL_TIME_VALUES.join('|')}))\s(.*)/.freeze
+      SPECIAL_PATTERN = /\A(@(#{SPECIAL_TIME_VALUES.join("|")}))\s(.*)/.freeze
       ENV_PATTERN = /\A(\S+)=(\S*)/.freeze
       ENVIRONMENT_PROPERTIES = %w{MAILTO PATH SHELL HOME}.freeze
 

data/lib/chef/provider/directory.rb

@@ -65,6 +65,17 @@ class Chef
           a.whyrun("Assuming directory #{parent_directory} would have been created")
         end
 
+        requirements.assert(:create) do |a|
+          a.assertion do
+            if ::File.exist?(new_resource.path)
+              ::File.directory?(new_resource.path)
+            else
+              true
+            end
+          end
+          a.failure_message(Chef::Exceptions::FileTypeMismatch, "Cannot create #{new_resource} at #{new_resource.path} because a file already exists at that path")
+        end
+
         requirements.assert(:create) do |a|
           parent_directory = ::File.dirname(new_resource.path)
           a.assertion do

data/lib/chef/provider/dsc_resource.rb

@@ -114,7 +114,7 @@ class Chef
           r = case found.length
               when 0
                 raise Chef::Exceptions::ResourceNotFound,
-                  "Could not find #{dsc_resource_name}. Check to make "\
+                  "Could not find #{dsc_resource_name}. Check to make " \
                   "sure that it shows up when running Get-DscResource"
               when 1
                 if found[0]["Module"].nil?
@@ -162,7 +162,7 @@ class Chef
 
       def invoke_resource(method)
         properties = translate_type(new_resource.properties)
-        switches = "-Method #{method} -Name #{new_resource.resource}"\
+        switches = "-Method #{method} -Name #{new_resource.resource}" \
                    " -Property #{properties} -Module #{module_info_object} -Verbose"
         Timeout.timeout(new_resource.timeout) {
           powershell_exec!("Invoke-DscResource #{switches}")

data/lib/chef/provider/git.rb

@@ -61,7 +61,7 @@ class Chef
           a.assertion { ::File.directory?(dirname) }
           a.whyrun("Directory #{dirname} does not exist, this run will fail unless it has been previously created. Assuming it would have been created.")
           a.failure_message(Chef::Exceptions::MissingParentDirectory,
-                            "Cannot clone #{new_resource} to #{cwd}, the enclosing directory #{dirname} does not exist")
+            "Cannot clone #{new_resource} to #{cwd}, the enclosing directory #{dirname} does not exist")
         end
 
         requirements.assert(:all_actions) do |a|

data/lib/chef/provider/ifconfig/debian.rb

@@ -87,7 +87,7 @@ iface <%= new_resource.device %> <%= new_resource.family %> static
           directory INTERFACES_DOT_D_DIR
 
           # roll our own file_edit resource, this will not get reported until we have a file_edit resource
-          interfaces_dot_d_for_regexp = INTERFACES_DOT_D_DIR.gsub(/\./, "\\.") # escape dots for the regexp
+          interfaces_dot_d_for_regexp = INTERFACES_DOT_D_DIR.gsub(".", "\\.") # escape dots for the regexp
           regexp = %r{^\s*source\s+#{interfaces_dot_d_for_regexp}/\*\s*$}
 
           return if ::File.exist?(INTERFACES_FILE) && regexp.match(IO.read(INTERFACES_FILE))

data/lib/chef/provider/mount/linux.rb

@@ -83,4 +83,4 @@ class Chef
       end
     end
   end
-end
+end

data/lib/chef/provider/mount/windows.rb

@@ -30,7 +30,7 @@ class Chef
         provides :mount, os: "windows"
 
         def is_volume(name)
-          /^\\\\\?\\Volume\{[\w-]+\}\\$/.match?(name) ? true : false
+          /^\\\\\?\\Volume\{[\w-]+\}\\$/.match?(name) || false
         end
 
         def initialize(new_resource, run_context)
@@ -62,9 +62,9 @@ class Chef
         def mount_fs
           unless @current_resource.mounted
             @mount.add(remote: @new_resource.device,
-                       username: @new_resource.username,
-                       domainname: @new_resource.domain,
-                       password: @new_resource.password)
+              username: @new_resource.username,
+              domainname: @new_resource.domain,
+              password: @new_resource.password)
             logger.trace("#{@new_resource} is mounted at #{@new_resource.mount_point}")
           else
             logger.debug("#{@new_resource} is already mounted at #{@new_resource.mount_point}")