chef 14.14.29 → 14.15.6

data/spec/integration/recipes/remote_directory.rb

@@ -22,7 +22,7 @@ describe Chef::Resource::RemoteDirectory do
     before do
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
       EOM
       directory "cookbooks/test" do
         directory "files/default/source_dir" do
@@ -50,7 +50,7 @@ describe Chef::Resource::RemoteDirectory do
              end
           EOM
         end
-        shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'test::default'", cwd: chef_dir)
+        shell_out!("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'test::default'", cwd: chef_dir)
       end
 
       def mode_of(path)

data/spec/integration/recipes/resource_action_spec.rb

@@ -154,7 +154,7 @@ module ResourceActionSpec
             ResourceActionSpec::ActionJackson.ruby_block_converged = ResourceActionSpec::ActionJackson.succeeded
           end
         end
-      EOM
+        EOM
         expect(ActionJackson.ran_action).to eq :access_attribute
         expect(ActionJackson.succeeded).to eq "foo!"
         expect(ActionJackson.ruby_block_converged).to eq "foo!"

data/spec/integration/recipes/resource_converge_if_changed_spec.rb

@@ -87,7 +87,7 @@ describe "Resource::ActionClass#converge_if_changed" do
               * #{resource_name}[blah] action create
                 - update default_identity1
                 -   set state1 to "new_state1" (was "current_state1")
-              EOM
+            EOM
           end
         end
 
@@ -109,7 +109,7 @@ describe "Resource::ActionClass#converge_if_changed" do
                 - update default_identity1
                 -   set state1 to "new_state1" (was "current_state1")
                 -   set state2 to "new_state2" (was "current_state2")
-EOM
+            EOM
           end
         end
 
@@ -132,7 +132,7 @@ EOM
                 - update default_identity1
                 -   set state1 to (suppressed sensitive property)
                 -   set state2 to (suppressed sensitive property)
-EOM
+            EOM
           end
         end
 
@@ -152,7 +152,7 @@ EOM
               * #{resource_name}[blah] action create
                 - update default_identity1
                 -   set sensitive1 to (suppressed sensitive property)
-EOM
+            EOM
           end
         end
 
@@ -173,7 +173,7 @@ EOM
               * #{resource_name}[blah] action create
                 - update default_identity1
                 -   set state2 to "new_state2" (was "current_state2")
-EOM
+            EOM
           end
         end
 
@@ -192,7 +192,7 @@ EOM
             expect(resource.updated?).to  be_falsey
             expect(converged_recipe.stdout).to eq <<~EOM
               * #{resource_name}[blah] action create (up to date)
-EOM
+            EOM
           end
         end
 
@@ -213,7 +213,7 @@ EOM
             expect(resource.updated?).to  be_falsey
             expect(converged_recipe.stdout).to eq <<~EOM
               * #{resource_name}[blah] action create (up to date)
-EOM
+            EOM
           end
         end
       end
@@ -270,7 +270,7 @@ EOM
                 -   set state1     to "default_state1" (default value)
                 -   set state2     to "default_state2" (default value)
                 -   set sensitive1 to (suppressed sensitive property) (default value)
-EOM
+            EOM
           end
         end
 
@@ -295,7 +295,7 @@ EOM
                 -   set state1     to "new_state1"
                 -   set state2     to "new_state2"
                 -   set sensitive1 to (suppressed sensitive property)
-EOM
+            EOM
           end
         end
 
@@ -320,7 +320,7 @@ EOM
                 -   set state1     to (suppressed sensitive property)
                 -   set state2     to (suppressed sensitive property)
                 -   set sensitive1 to (suppressed sensitive property) (default value)
-EOM
+            EOM
           end
         end
       end
@@ -357,7 +357,7 @@ EOM
             expect(resource.updated?).to  be_falsey
             expect(converged_recipe.stdout).to eq <<~EOM
               * #{resource_name}[blah] action create (up to date)
-EOM
+            EOM
           end
         end
 
@@ -378,7 +378,7 @@ EOM
               * #{resource_name}[blah] action create
                 - update default_identity1
                 -   set state1 to "new_state1" (was "current_state1")
-EOM
+            EOM
           end
         end
 
@@ -401,7 +401,7 @@ EOM
                 -   set state1 to "new_state1" (was "current_state1")
                 - update default_identity1
                 -   set state2 to "new_state2" (was "current_state2")
-EOM
+            EOM
           end
         end
 
@@ -422,7 +422,7 @@ EOM
               * #{resource_name}[blah] action create
                 - update default_identity1
                 -   set state2 to "new_state2" (was "current_state2")
-EOM
+            EOM
           end
         end
 
@@ -441,7 +441,7 @@ EOM
             expect(resource.updated?).to  be_falsey
             expect(converged_recipe.stdout).to eq <<~EOM
               * #{resource_name}[blah] action create (up to date)
-EOM
+            EOM
           end
         end
 
@@ -461,7 +461,7 @@ EOM
               * #{resource_name}[blah] action create
                 - update default_identity1
                 -   set sensitive1 to (suppressed sensitive property)
-EOM
+            EOM
           end
         end
       end
@@ -489,7 +489,7 @@ EOM
                 -   set state2 to "default_state2" (default value)
                 - create default_identity1
                 -   set sensitive1 to (suppressed sensitive property) (default value)
-EOM
+            EOM
           end
         end
 
@@ -515,7 +515,7 @@ EOM
                 -   set state2 to "new_state2"
                 - create default_identity1
                 -   set sensitive1 to (suppressed sensitive property)
-EOM
+            EOM
           end
         end
 
@@ -541,7 +541,7 @@ EOM
                 -   set state2 to (suppressed sensitive property)
                 - create default_identity1
                 -   set sensitive1 to (suppressed sensitive property) (default value)
-EOM
+            EOM
           end
         end
 

data/spec/integration/solo/solo_spec.rb

@@ -25,8 +25,8 @@ describe "chef-solo" do
     before do
       file "config/solo.rb", <<~EOM
         chef_repo_path "#{@repository_dir}"
-EOM
-      result = shell_out("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -l debug", cwd: chef_dir)
+      EOM
+      result = shell_out("ruby bin/chef-solo -c \"#{path_to("config/solo.rb")}\" -l debug", cwd: chef_dir)
       result.error!
     end
 
@@ -75,25 +75,25 @@ EOM
 
     it "should complete with success" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
-EOM
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
+      EOM
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       result.error!
       expect(result.stdout).to include("ITWORKS")
     end
 
     it "should evaluate its node.json file" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
-EOM
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
+      EOM
 
       file "config/node.json", <<~E
         {"run_list":["x::default"]}
-E
+      E
 
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -j '#{path_to('config/node.json')}' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -j '#{path_to("config/node.json")}' -l debug", cwd: chef_dir)
       result.error!
       expect(result.stdout).to include("ITWORKS")
     end
@@ -111,10 +111,10 @@ E
 
     it "should exit with an error" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
-EOM
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
+      EOM
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       expect(result.exitstatus).to eq(0) # For CHEF-5120 this becomes 1
       expect(result.stdout).to include("WARN: MissingCookbookDependency")
     end
@@ -125,13 +125,13 @@ EOM
       file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0", "\nchef_version '~> 999.0'")
       file "cookbooks/x/recipes/default.rb", 'puts "ITWORKS"'
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
-EOM
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
+      EOM
     end
 
     it "should exit with an error" do
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       expect(result.exitstatus).to eq(1)
       expect(result.stdout).to include("Chef::Exceptions::CookbookChefVersionMismatch")
     end
@@ -142,13 +142,13 @@ EOM
       file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0", "\nohai_version '~> 999.0'")
       file "cookbooks/x/recipes/default.rb", 'puts "ITWORKS"'
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
-EOM
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
+      EOM
     end
 
     it "should exit with an error" do
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       expect(result.exitstatus).to eq(1)
       expect(result.stdout).to include("Chef::Exceptions::CookbookOhaiVersionMismatch")
     end
@@ -169,14 +169,14 @@ EOM
             end
           end
         end
-EOM
+      EOM
     end
 
     it "while running solo concurrently" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
-EOM
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
+      EOM
       # We have a timeout protection here so that if due to some bug
       # run_lock gets stuck we can discover it.
       expect do
@@ -187,13 +187,13 @@ EOM
 
           # Instantiate the first chef-solo run
           threads << Thread.new do
-            s1 = Process.spawn("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default'  -l debug -L #{path_to('logs/runs.log')}", chdir: chef_dir)
+            s1 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default'  -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
             Process.waitpid(s1)
           end
 
           # Instantiate the second chef-solo run
           threads << Thread.new do
-            s2 = Process.spawn("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default'  -l debug -L #{path_to('logs/runs.log')}", chdir: chef_dir)
+            s2 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default'  -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
             Process.waitpid(s2)
           end
 

data/spec/scripts/ssl-serve.rb

@@ -34,7 +34,7 @@ DEFAULT_OPTIONS = {
   Host: "localhost",
   environment: :none,
   Logger: LOGGER,
-  DocumentRoot: File.expand_path("#{Dir.tmpdir}/chef-118-sampledata")
+  DocumentRoot: File.expand_path("#{Dir.tmpdir}/chef-118-sampledata"),
   #:AccessLog => [] # Remove this option to enable the access log when debugging.
 }.freeze
 

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2020, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,7 +52,7 @@ require "chef/knife"
 
 Dir["lib/chef/knife/**/*.rb"]
   .map { |f| f.gsub("lib/", "") }
-  .map { |f| f.gsub(%r{\.rb$}, "") }
+  .map { |f| f.gsub(/\.rb$/, "") }
   .each { |f| require f }
 
 require "chef/resource_resolver"
@@ -93,7 +93,7 @@ require "spec/support/shared/unit/mock_shellout"
 Dir["spec/support/**/*.rb"]
   .reject { |f| f =~ %r{^spec/support/platforms} }
   .reject { |f| f =~ %r{^spec/support/pedant} }
-  .map { |f| f.gsub(%r{.rb$}, "") }
+  .map { |f| f.gsub(/.rb$/, "") }
   .map { |f| f.gsub(%r{spec/}, "") }
   .each { |f| require f }
 
@@ -140,19 +140,18 @@ RSpec.configure do |config|
 
   config.filter_run_excluding skip_appveyor: true if ENV["APPVEYOR"]
   config.filter_run_excluding appveyor_only: true unless ENV["APPVEYOR"]
-  config.filter_run_excluding skip_travis: true if ENV["TRAVIS"]
 
   config.filter_run_excluding skip_buildkite: true if ENV["BUILDKITE"]
 
   config.filter_run_excluding windows_only: true unless windows?
+  config.filter_run_excluding not_supported_on_windows: true if windows?
   config.filter_run_excluding not_supported_on_mac_osx: true if mac_osx?
-  config.filter_run_excluding mac_osx_only: true if !mac_osx?
+  config.filter_run_excluding mac_osx_only: true unless mac_osx?
   config.filter_run_excluding not_supported_on_aix: true if aix?
   config.filter_run_excluding not_supported_on_solaris: true if solaris?
   config.filter_run_excluding not_supported_on_gce: true if gce?
   config.filter_run_excluding not_supported_on_nano: true if windows_nano_server?
   config.filter_run_excluding win2012r2_only: true unless windows_2012r2?
-  config.filter_run_excluding windows_2008r2_or_later: true unless windows_2008r2_or_later?
   config.filter_run_excluding windows64_only: true unless windows64?
   config.filter_run_excluding windows32_only: true unless windows32?
   config.filter_run_excluding windows_nano_only: true unless windows_nano_server?
@@ -161,7 +160,7 @@ RSpec.configure do |config|
   config.filter_run_excluding ruby64_only: true unless ruby_64bit?
   config.filter_run_excluding ruby32_only: true unless ruby_32bit?
   config.filter_run_excluding windows_powershell_dsc_only: true unless windows_powershell_dsc?
-  config.filter_run_excluding windows_powershell_no_dsc_only: true unless ! windows_powershell_dsc?
+  config.filter_run_excluding windows_powershell_no_dsc_only: true if windows_powershell_dsc?
   config.filter_run_excluding windows_domain_joined_only: true unless windows_domain_joined?
   config.filter_run_excluding windows_not_domain_joined_only: true if windows_domain_joined?
   # We think this line was causing rspec tests to not run on the Jenkins windows
@@ -189,7 +188,6 @@ RSpec.configure do |config|
   config.filter_run_excluding not_wpar: true unless wpar?
   config.filter_run_excluding not_supported_under_fips: true if fips?
   config.filter_run_excluding rhel: true unless rhel?
-  config.filter_run_excluding rhel5: true unless rhel5?
   config.filter_run_excluding rhel6: true unless rhel6?
   config.filter_run_excluding rhel7: true unless rhel7?
   config.filter_run_excluding rhel8: true unless rhel8?
@@ -204,7 +202,9 @@ RSpec.configure do |config|
   config.filter_run_excluding chef: DependencyProc.with(Chef::VERSION)
   config.filter_run_excluding ruby: DependencyProc.with(RUBY_VERSION)
 
+  # check for particular binaries we need
   config.filter_run_excluding choco_installed: true unless choco_installed?
+  config.filter_run_excluding requires_ifconfig: true unless ifconfig?
 
   running_platform_arch = `uname -m`.strip unless windows?
 
@@ -316,14 +316,11 @@ require "thread"
 module WEBrick
   module Utils
     class TimeoutHandler
-      def initialize
-      end
+      def initialize; end
 
-      def register(*args)
-      end
+      def register(*args); end
 
-      def cancel(*args)
-      end
+      def cancel(*args); end
     end
   end
 end

data/spec/stress/win32/security_spec.rb

@@ -50,7 +50,7 @@ describe "Chef::ReservedNames::Win32::Security", :windows_only do
 
   it "should not leak when retrieving and reading the ACE from a file", :volatile do
     expect do
-      sids = Chef::ReservedNames::Win32::Security::SecurableObject.new(@monkeyfoo).security_descriptor.dacl.select { |ace| ace.sid }
+      sids = Chef::ReservedNames::Win32::Security::SecurableObject.new(@monkeyfoo).security_descriptor.dacl.select(&:sid)
       GC.start
     end.not_to leak_memory(warmup: 50, iterations: 100)
   end

data/spec/support/lib/chef/resource/zen_follower.rb

@@ -25,7 +25,7 @@ class Chef
       provides :follower, platform: "zen"
 
       def master(arg = nil)
-        if !arg.nil?
+        unless arg.nil?
           @master = arg
         end
         @master

data/spec/support/lib/chef/resource/zen_master.rb

@@ -30,7 +30,7 @@ class Chef
       end
 
       def something(arg = nil)
-        if !arg.nil?
+        unless arg.nil?
           @something = arg
         end
         @something