chef 15.17.4 → 16.0.257

data/spec/functional/util/powershell/cmdlet_spec.rb

@@ -17,7 +17,7 @@
 #
 
 require "chef/json_compat"
-require File.expand_path("../../../spec_helper", __dir__)
+require_relative "../../../spec_helper"
 
 describe Chef::Util::Powershell::Cmdlet, :windows_powershell_dsc_only do
   before(:all) do

data/spec/functional/version_spec.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.expand_path("../spec_helper", __dir__)
+require_relative "../spec_helper"
 require "chef/mixin/shell_out"
 require "chef/version"
 require "ohai/version"

data/spec/functional/win32/registry_spec.rb

@@ -56,12 +56,6 @@ describe "Chef::Win32::Registry", :windows_only do
     end
   end
 
-  # Server Versions
-  # it "succeeds if server versiion is 2003R2, 2008, 2008R2, 2012" do
-  # end
-  # it "falis if the server versions are anything else" do
-  # end
-
   describe "hive_exists?" do
     it "returns true if the hive exists" do
       expect(@registry.hive_exists?("HKCU\\Software\\Root")).to eq(true)

data/spec/functional/win32/security_spec.rb

@@ -199,6 +199,28 @@ describe "Chef::Win32::Security", :windows_only do
     end
   end
 
+  describe ".get_account_with_user_rights" do
+    let(:domain) { ENV["COMPUTERNAME"] }
+    let(:username) { ENV["USERNAME"] }
+
+    context "when given a valid user right" do
+      it "gets all accounts associated with given user right" do
+        Chef::ReservedNames::Win32::Security.add_account_right(username, "SeBatchLogonRight")
+        expect(Chef::ReservedNames::Win32::Security.get_account_with_user_rights("SeBatchLogonRight").flatten).to include("#{domain}\\#{username}")
+        Chef::ReservedNames::Win32::Security.remove_account_right(username, "SeBatchLogonRight")
+        expect(Chef::ReservedNames::Win32::Security.get_account_with_user_rights("SeBatchLogonRight").flatten).not_to include("#{domain}\\#{username}")
+      end
+    end
+
+    context "when given an invalid user right" do
+      let(:user_right) { "SeTest" }
+
+      it "returns empty array" do
+        expect(Chef::ReservedNames::Win32::Security.get_account_with_user_rights(user_right)).to be_empty
+      end
+    end
+  end
+
   describe ".test_and_raise_lsa_nt_status" do
     # NTSTATUS code: 0xC0000001 / STATUS_UNSUCCESSFUL
     # Windows Error: ERROR_GEN_FAILURE / 31 / 0x1F / A device attached to the system is not functioning.

data/spec/functional/win32/service_manager_spec.rb

@@ -125,7 +125,7 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind
         it "start should start the service", :volatile do
           service_manager.run(["-a", "start"])
           expect(test_service_state).to eq("running")
-          expect(File.exist?(test_service_file)).to be_truthy
+          expect(File.exists?(test_service_file)).to be_truthy
         end
 
         it "stop should not affect the service" do

data/spec/integration/client/client_spec.rb

@@ -11,8 +11,8 @@ describe "chef-client" do
     File.join(CHEF_SPEC_DATA, "recipes.tgz")
   end
 
-  def start_tiny_server(server_opts = {})
-    @server = TinyServer::Manager.new(server_opts)
+  def start_tiny_server(**server_opts)
+    @server = TinyServer::Manager.new(**server_opts)
     @server.start
     @api = TinyServer::API.instance
     @api.clear
@@ -739,4 +739,125 @@ EOM
       expect(command.stdout).to include("NOFORK")
     end
   end
+
+  when_the_repository "has an eager_load_libraries false cookbook" do
+    before do
+      file "cookbooks/x/libraries/require_me.rb", <<~'EOM'
+        class RequireMe
+        end
+      EOM
+      file "cookbooks/x/recipes/default.rb", <<~'EOM'
+        # shouldn't be required by default
+        raise "boom" if defined?(RequireMe)
+        require "require_me"
+        # should be in the LOAD_PATH
+        raise "boom" unless defined?(RequireMe)
+      EOM
+      file "cookbooks/x/metadata.rb", <<~EOM
+        name 'x'
+        version '0.0.1'
+        eager_load_libraries false
+      EOM
+      file "config/client.rb", <<~EOM
+        local_mode true
+        cookbook_path "#{path_to("cookbooks")}"
+      EOM
+    end
+
+    it "should not eagerly load the library" do
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'", cwd: chef_dir)
+      result.error!
+    end
+  end
+
+  when_the_repository "has an eager_load_libraries cookbook with a default hook" do
+    before do
+      file "cookbooks/x/libraries/aa_require_me.rb", <<~'EOM'
+        class RequireMe
+        end
+      EOM
+      file "cookbooks/x/libraries/default.rb", <<~'EOM'
+        raise "boom" if defined?(RequireMe)
+        require "aa_require_me"
+      EOM
+      file "cookbooks/x/libraries/nope/default.rb", <<~'EOM'
+        raise "boom" # this should never be required
+      EOM
+      file "cookbooks/x/recipes/default.rb", <<~'EOM'
+        raise "boom" unless defined?(RequireMe)
+      EOM
+      file "cookbooks/x/metadata.rb", <<~EOM
+        name 'x'
+        version '0.0.1'
+        eager_load_libraries "default.rb"
+      EOM
+      file "config/client.rb", <<~EOM
+        local_mode true
+        cookbook_path "#{path_to("cookbooks")}"
+        always_dump_stacktrace true
+      EOM
+    end
+
+    it "should properly load the library via the hook" do
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'", cwd: chef_dir)
+      result.error!
+    end
+  end
+
+  when_the_repository "has an eager_load_libraries false cookbook" do
+    before do
+      # this is loaded by default.rb
+      file "cookbooks/x/libraries/aa_require_me.rb", <<~'EOM'
+        class RequireMe
+        end
+      EOM
+      # this is loaded by eager_load_libraries
+      file "cookbooks/x/libraries/default.rb", <<~'EOM'
+        raise "boom" if defined?(RequireMe)
+        require "aa_require_me"
+      EOM
+      # this is loaded by the recipe using the LOAD_PATH
+      file "cookbooks/x/libraries/require_me.rb", <<~'EOM'
+        class RequireMe4
+        end
+      EOM
+      # these two are loaded by eager_load_libraries glob
+      file "cookbooks/x/libraries/loadme/foo/require_me.rb", <<~'EOM'
+        class RequireMe2
+        end
+      EOM
+      file "cookbooks/x/libraries/loadme/require_me.rb", <<~'EOM'
+        class RequireMe3
+        end
+      EOM
+      # this should nevrer be loaded
+      file "cookbooks/x/libraries/nope/require_me.rb", <<~'EOM'
+        raise "boom" # this should never be required
+      EOM
+      file "cookbooks/x/recipes/default.rb", <<~'EOM'
+        # all these are loaded by the eager_load_libraries
+        raise "boom" unless defined?(RequireMe)
+        raise "boom" unless defined?(RequireMe2)
+        raise "boom" unless defined?(RequireMe3)
+        raise "boom" if defined?(RequireMe4)
+        require "require_me"
+        raise "boom" unless defined?(RequireMe4)
+      EOM
+      file "cookbooks/x/metadata.rb", <<~EOM
+        name 'x'
+        version '0.0.1'
+        eager_load_libraries [ "default.rb", "loadme/**/*.rb" ]
+      EOM
+      file "config/client.rb", <<~EOM
+        local_mode true
+        cookbook_path "#{path_to("cookbooks")}"
+        always_dump_stacktrace true
+      EOM
+    end
+
+    it "should not eagerly load the library" do
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'x::default'", cwd: chef_dir)
+      result.error!
+    end
+  end
 end

data/spec/integration/knife/cookbook_show_spec.rb

@@ -43,25 +43,26 @@ describe "knife cookbook show", :workstation do
         metadata:
           chef_versions:
           dependencies:
-          description:      
+          description:
+          eager_load_libraries: true
           gems:
-          issues_url:       
-          license:          All rights reserved
-          long_description: 
-          maintainer:       
-          maintainer_email: 
-          name:             x
+          issues_url:
+          license:              All rights reserved
+          long_description:
+          maintainer:
+          maintainer_email:
+          name:                 x
           ohai_versions:
           platforms:
-          privacy:          false
+          privacy:              false
           providing:
             x:    >= 0.0.0
             x::x: >= 0.0.0
           recipes:
-            x:    
-            x::x: 
-          source_url:       
-          version:          1.0.0
+            x:
+            x::x:
+          source_url:
+          version:              1.0.0
         name:          x-1.0.0
         recipes:
           checksum:    4631b34cf58de10c5ef1304889941b2e
@@ -69,7 +70,7 @@ describe "knife cookbook show", :workstation do
           path:        recipes/default.rb
           specificity: default
           url:         http://127.0.0.1:8900/file_store/checksums/4631b34cf58de10c5ef1304889941b2e
-          
+
           checksum:    d41d8cd98f00b204e9800998ecf8427e
           name:        recipes/x.rb
           path:        recipes/x.rb
@@ -89,25 +90,26 @@ describe "knife cookbook show", :workstation do
       knife("cookbook show x 1.0.0 metadata").should_succeed <<~EOM
         chef_versions:
         dependencies:
-        description:      
+        description:
+        eager_load_libraries: true
         gems:
-        issues_url:       
-        license:          All rights reserved
-        long_description: 
-        maintainer:       
-        maintainer_email: 
-        name:             x
+        issues_url:
+        license:              All rights reserved
+        long_description:
+        maintainer:
+        maintainer_email:
+        name:                 x
         ohai_versions:
         platforms:
-        privacy:          false
+        privacy:              false
         providing:
           x:    >= 0.0.0
           x::x: >= 0.0.0
         recipes:
-          x:    
-          x::x: 
-        source_url:       
-        version:          1.0.0
+          x:
+          x::x:
+        source_url:
+        version:              1.0.0
       EOM
     end
 
@@ -118,7 +120,7 @@ describe "knife cookbook show", :workstation do
         path:        recipes/default.rb
         specificity: default
         url:         http://127.0.0.1:8900/file_store/checksums/4631b34cf58de10c5ef1304889941b2e
-        
+
         checksum:    d41d8cd98f00b204e9800998ecf8427e
         name:        recipes/x.rb
         path:        recipes/x.rb

data/spec/integration/knife/data_bag_show_spec.rb

@@ -27,7 +27,7 @@ describe "knife data bag show", :workstation do
 
   when_the_chef_server "is empty" do
     it "raises error if try to retrieve it" do
-      expect { knife("data bag show bag") }.to raise_error(Net::HTTPServerException)
+      expect { knife("data bag show bag") }.to raise_error(Net::HTTPClientException)
     end
   end
 

data/spec/integration/knife/raw_spec.rb

@@ -143,7 +143,21 @@ describe "knife raw", :workstation do
           /roles/x.json:
           {
             "name": "x",
-            "description": "eek"
+            "description": "eek",
+            "json_class": "Chef::Role",
+            "chef_type": "role",
+            "default_attributes": {
+
+            },
+            "override_attributes": {
+
+            },
+            "run_list": [
+
+            ],
+            "env_run_lists": {
+
+            }
           }
         EOM
       end
@@ -179,7 +193,21 @@ describe "knife raw", :workstation do
           /roles/y.json:
           {
             "name": "y",
-            "description": "eek"
+            "description": "eek",
+            "json_class": "Chef::Role",
+            "chef_type": "role",
+            "default_attributes": {
+
+            },
+            "override_attributes": {
+
+            },
+            "run_list": [
+
+            ],
+            "env_run_lists": {
+
+            }
           }
         EOM
       end

data/spec/integration/knife/show_spec.rb

@@ -81,7 +81,19 @@ describe "knife show", :workstation do
         knife("show /environments/x.json").should_succeed <<~EOM
           /environments/x.json:
           {
-            "name": "x"
+            "name": "x",
+            "description": "",
+            "cookbook_versions": {
+
+            },
+            "default_attributes": {
+
+            },
+            "override_attributes": {
+
+            },
+            "json_class": "Chef::Environment",
+            "chef_type": "environment"
           }
         EOM
       end
@@ -97,7 +109,22 @@ describe "knife show", :workstation do
         knife("show /roles/x.json").should_succeed <<~EOM
           /roles/x.json:
           {
-            "name": "x"
+            "name": "x",
+            "description": "",
+            "json_class": "Chef::Role",
+            "chef_type": "role",
+            "default_attributes": {
+
+            },
+            "override_attributes": {
+
+            },
+            "run_list": [
+
+            ],
+            "env_run_lists": {
+
+            }
           }
         EOM
       end
@@ -150,7 +177,9 @@ describe "knife show", :workstation do
           },
           "override_attributes": {
             "x": "y"
-          }
+          },
+          "json_class": "Chef::Environment",
+          "chef_type": "environment"
         }
       EOM
     end

data/spec/integration/recipes/accumulator_spec.rb

@@ -6,7 +6,7 @@ describe "Accumulators" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
+  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:

data/spec/integration/recipes/lwrp_inline_resources_spec.rb

@@ -6,7 +6,7 @@ describe "LWRPs with inline resources" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
+  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:
@@ -21,7 +21,7 @@ describe "LWRPs with inline resources" do
 
   context "with a use_inline_resources provider with 'def action_a' instead of action :a" do
     class LwrpInlineResourcesTest < Chef::Resource
-      resource_name :lwrp_inline_resources_test
+      provides :lwrp_inline_resources_test
       allowed_actions :a, :nothing
       default_action :a
       property :ran_a
@@ -47,8 +47,8 @@ describe "LWRPs with inline resources" do
 
   context "with an inline resource with a property that shadows the enclosing provider's property" do
     class LwrpShadowedPropertyTest < Chef::Resource
+      provides :lwrp_shadowed_property_test
       PATH = ::File.join(Dir.tmpdir, "shadow-property.txt")
-      use_automatic_resource_name
       allowed_actions :fiddle
       property :content
       action :fiddle do
@@ -59,7 +59,7 @@ describe "LWRPs with inline resources" do
       end
     end
 
-    after { File.delete(LwrpShadowedPropertyTest::PATH) if File.exist?(LwrpShadowedPropertyTest::PATH) }
+    after { File.delete(LwrpShadowedPropertyTest::PATH) if File.exists?(LwrpShadowedPropertyTest::PATH) }
 
     # https://github.com/chef/chef/issues/4334
     it "does not warn spuriously" do
@@ -74,7 +74,7 @@ describe "LWRPs with inline resources" do
 
   context "with an inline_resources provider with two actions, one calling the other" do
     class LwrpInlineResourcesTest2 < Chef::Resource
-      resource_name :lwrp_inline_resources_test2
+      provides :lwrp_inline_resources_test2
       allowed_actions :a, :b, :nothing
       default_action :b
       property :ran_a